Mageia Bugzilla – Attachment 7116 Details for
Bug 16943
python-iniparse doesn't generate necessary Require for python-six (Patch included)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Fixes setup/egg information to generate proper pythonegg()() Requires
file_16943.txt (text/plain), 2.97 KB, created by
Neal Gompa
on 2015-10-11 23:43:36 CEST
(
hide
)
Description:
Fixes setup/egg information to generate proper pythonegg()() Requires
Filename:
MIME Type:
Creator:
Neal Gompa
Created:
2015-10-11 23:43:36 CEST
Size:
2.97 KB
patch
obsolete
>Index: SOURCES/python-iniparse-setup-fixes.patch >=================================================================== >--- SOURCES/python-iniparse-setup-fixes.patch (revision 0) >+++ SOURCES/python-iniparse-setup-fixes.patch (working copy) >@@ -0,0 +1,48 @@ >+diff --git a/PKG-INFO b/PKG-INFO >+index 31c4ad2..bebcb80 100644 >+--- PKG-INFO >++++ PKG-INFO >+@@ -18,7 +18,10 @@ Classifier: License :: OSI Approved :: MIT License >+ Classifier: License :: OSI Approved :: Python Software Foundation License >+ Classifier: Operating System :: OS Independent >+ Classifier: Programming Language :: Python >+-Classifier: Programming Language :: Python :: 2.4 >+-Classifier: Programming Language :: Python :: 2.5 >++Classifier: Programming Language :: Python :: 2 >+ Classifier: Programming Language :: Python :: 2.6 >++Classifier: Programming Language :: Python :: 2.7 >++Classifier: Programming Language :: Python :: 3 >++Classifier: Programming Language :: Python :: 3.3 >++Classifier: Programming Language :: Python :: 3.4 >+ Classifier: Topic :: Software Development :: Libraries :: Python Modules >+diff --git a/setup.py b/setup.py >+index 736cfa1..e2f8de0 100644 >+--- setup.py >++++ setup.py >+@@ -1,6 +1,6 @@ >+ #!/usr/bin/env python >+ >+-from distutils.core import setup >++from setuptools import setup >+ >+ VERSION = '0.4' >+ >+@@ -24,12 +24,16 @@ use.''', >+ 'License :: OSI Approved :: Python Software Foundation License', >+ 'Operating System :: OS Independent', >+ 'Programming Language :: Python', >+- 'Programming Language :: Python :: 2.4', >+- 'Programming Language :: Python :: 2.5', >++ 'Programming Language :: Python :: 2' >+ 'Programming Language :: Python :: 2.6', >++ 'Programming Language :: Python :: 2.7', >++ 'Programming Language :: Python :: 3', >++ 'Programming Language :: Python :: 3.3', >++ 'Programming Language :: Python :: 3.4' >+ 'Topic :: Software Development :: Libraries :: Python Modules', >+ ], >+ packages = ['iniparse'], >++ install_requires=['six'], >+ data_files = [ >+ ('share/doc/iniparse-%s' % VERSION, ['README', 'LICENSE-PSF', >+ 'LICENSE', 'Changelog', >Index: SPECS/python-iniparse.spec >=================================================================== >--- SPECS/python-iniparse.spec (revision 889809) >+++ SPECS/python-iniparse.spec (working copy) >@@ -2,7 +2,7 @@ > > Name: python-%oname > Version: 0.4 >-Release: %mkrel 11 >+Release: %mkrel 12 > Summary: INI parser for python > License: MIT > Group: Development/Python >@@ -11,6 +11,7 @@ > # From Fedora > Patch0: fix-issue-28.patch > Patch1: %{name}-python3-compat.patch >+Patch2: %{name}-setup-fixes.patch > BuildArch: noarch > BuildRequires: pkgconfig(python2) > BuildRequires: python-six >@@ -56,6 +57,7 @@ > %setup -q -n iniparse-%{version} > %patch0 -p1 > %patch1 -p0 >+%patch2 -p0 > chmod -c -x html/index.html > cp -a . %{py3dir}
Index: SOURCES/python-iniparse-setup-fixes.patch =================================================================== --- SOURCES/python-iniparse-setup-fixes.patch (revision 0) +++ SOURCES/python-iniparse-setup-fixes.patch (working copy) @@ -0,0 +1,48 @@ +diff --git a/PKG-INFO b/PKG-INFO +index 31c4ad2..bebcb80 100644 +--- PKG-INFO ++++ PKG-INFO +@@ -18,7 +18,10 @@ Classifier: License :: OSI Approved :: MIT License + Classifier: License :: OSI Approved :: Python Software Foundation License + Classifier: Operating System :: OS Independent + Classifier: Programming Language :: Python +-Classifier: Programming Language :: Python :: 2.4 +-Classifier: Programming Language :: Python :: 2.5 ++Classifier: Programming Language :: Python :: 2 + Classifier: Programming Language :: Python :: 2.6 ++Classifier: Programming Language :: Python :: 2.7 ++Classifier: Programming Language :: Python :: 3 ++Classifier: Programming Language :: Python :: 3.3 ++Classifier: Programming Language :: Python :: 3.4 + Classifier: Topic :: Software Development :: Libraries :: Python Modules +diff --git a/setup.py b/setup.py +index 736cfa1..e2f8de0 100644 +--- setup.py ++++ setup.py +@@ -1,6 +1,6 @@ + #!/usr/bin/env python + +-from distutils.core import setup ++from setuptools import setup + + VERSION = '0.4' + +@@ -24,12 +24,16 @@ use.''', + 'License :: OSI Approved :: Python Software Foundation License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', +- 'Programming Language :: Python :: 2.4', +- 'Programming Language :: Python :: 2.5', ++ 'Programming Language :: Python :: 2' + 'Programming Language :: Python :: 2.6', ++ 'Programming Language :: Python :: 2.7', ++ 'Programming Language :: Python :: 3', ++ 'Programming Language :: Python :: 3.3', ++ 'Programming Language :: Python :: 3.4' + 'Topic :: Software Development :: Libraries :: Python Modules', + ], + packages = ['iniparse'], ++ install_requires=['six'], + data_files = [ + ('share/doc/iniparse-%s' % VERSION, ['README', 'LICENSE-PSF', + 'LICENSE', 'Changelog', Index: SPECS/python-iniparse.spec =================================================================== --- SPECS/python-iniparse.spec (revision 889809) +++ SPECS/python-iniparse.spec (working copy) @@ -2,7 +2,7 @@ Name: python-%oname Version: 0.4 -Release: %mkrel 11 +Release: %mkrel 12 Summary: INI parser for python License: MIT Group: Development/Python @@ -11,6 +11,7 @@ # From Fedora Patch0: fix-issue-28.patch Patch1: %{name}-python3-compat.patch +Patch2: %{name}-setup-fixes.patch BuildArch: noarch BuildRequires: pkgconfig(python2) BuildRequires: python-six @@ -56,6 +57,7 @@ %setup -q -n iniparse-%{version} %patch0 -p1 %patch1 -p0 +%patch2 -p0 chmod -c -x html/index.html cp -a . %{py3dir}
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 16943
: 7116