From e5e77d203ee98b3843953958df9741d8c6b7a81b Mon Sep 17 00:00:00 2001 From: Jay Greguske Date: Tue, 10 May 2016 12:35:01 -0400 Subject: [PATCH 1/7] initial import (bz1297491) --- .gitignore | 1 + python-multilib.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 73 insertions(+) create mode 100644 python-multilib.spec diff --git a/.gitignore b/.gitignore index e69de29..b60320b 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/python-multilib-1.1.tar.gz diff --git a/python-multilib.spec b/python-multilib.spec new file mode 100644 index 0000000..7d676b0 --- /dev/null +++ b/python-multilib.spec @@ -0,0 +1,71 @@ +Name: python-multilib +Version: 1.1 +Release: 4%{?dist} +Summary: A module for determining if a package is multilib or not +License: GPLv2 +URL: https://github.com/Zyzyx/%{name} +Source0: https://github.com/Zyzyx/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildArch: noarch + +%global _description \ +A Python module that supports several multilib "methods" useful for determining \ +if a 32-bit package should be included with its 64-bit analogue in a compose. + +%description %{_description} + +%package -n python2-multilib +Summary: %{summary} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +%{?python_provide:%python_provide python2-multilib} +%description -n python2-multilib %{_description} + +%package -n python3-multilib +Summary: %{summary} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +%{?python_provide:%python_provide python3-multilib} +%description -n python3-multilib %{_description} + + +%prep +%setup -q + + +%build +%py2_build +#py3_build + +%install +%py2_install +#py3_install + +%check +# testing requires complete composes available locally, which no buildsystem +# would ever want included in a build root +#{__python2} setup.py test +#{__python3} setup.py test + +%files -n python2-multilib +%license LICENSE +%doc README.md +%{python2_sitelib}/* +%config(noreplace) %{_sysconfdir}/multilib.conf + +#files -n python3-multilib +#license LICENSE +#doc README.md +#{python3_sitelib}/* + +%changelog +* Thu Apr 07 2016 Dennis Gilmore - 1.1-2 +- setup to make python3 down the road. +- spec and srpm named python-multilib +- fix license + +* Tue Jul 21 2009 Jay Greguske - 1.1-1 +- consider dependencies in multilib testing +- fix a couple import errors + +* Tue Jul 21 2009 Jay Greguske - 1.0-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..56ec71e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +bc561564dcdafbca8a29f9d45366b435 python-multilib-1.1.tar.gz From f77ac55adccab801e2ee4d3f3ef007a3eb44a4c8 Mon Sep 17 00:00:00 2001 From: Jay Greguske Date: Wed, 29 Jun 2016 15:05:30 -0400 Subject: [PATCH 2/7] add the python3 patch --- python-multilib.spec | 62 ++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/python-multilib.spec b/python-multilib.spec index 7d676b0..73fd1d8 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,44 +1,64 @@ Name: python-multilib Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A module for determining if a package is multilib or not +Group: Development/Libraries License: GPLv2 -URL: https://github.com/Zyzyx/%{name} -Source0: https://github.com/Zyzyx/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildArch: noarch +URL: https://github.com/Zyzyx/%{name}/ +Source0: https://github.com/Zyzyx/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +BuildArch: noarch +Patch01: 001-python-six.patch + %global _description \ -A Python module that supports several multilib "methods" useful for determining \ -if a 32-bit package should be included with its 64-bit analogue in a compose. +A Python module that supports several multilib "methods" useful for \ +determining if a 32-bit package should be included with its 64-bit analogue \ +in a compose. %description %{_description} +%package conf +Summary: Configuration files for %{name} + +%description conf +This package provides the configuration files for %{name}. + %package -n python2-multilib Summary: %{summary} +%{?python_provide:%python_provide python2-multilib} BuildRequires: python2-devel BuildRequires: python2-setuptools -%{?python_provide:%python_provide python2-multilib} +BuildRequires: python2-six +Requires: python2-six +Requires: python2 +Requires: %{name}-conf = %{version}-%{release} + %description -n python2-multilib %{_description} %package -n python3-multilib Summary: %{summary} +%{?python_provide:%python_provide python3-multilib} BuildRequires: python3-devel BuildRequires: python3-setuptools -%{?python_provide:%python_provide python3-multilib} +BuildRequires: python3-six +Requires: python3-six +Requires: python3 +Requires: %{name}-conf = %{version}-%{release} + %description -n python3-multilib %{_description} %prep %setup -q - +%patch01 -p1 %build %py2_build -#py3_build +%py3_build %install %py2_install -#py3_install +%py3_install %check # testing requires complete composes available locally, which no buildsystem @@ -46,18 +66,28 @@ BuildRequires: python3-setuptools #{__python2} setup.py test #{__python3} setup.py test +%files conf +%config(noreplace) %{_sysconfdir}/multilib.conf + %files -n python2-multilib %license LICENSE %doc README.md %{python2_sitelib}/* -%config(noreplace) %{_sysconfdir}/multilib.conf -#files -n python3-multilib -#license LICENSE -#doc README.md -#{python3_sitelib}/* +%files -n python3-multilib +%license LICENSE +%doc README.md +%{python3_sitelib}/* + %changelog +* Wed Jun 29 2016 Jay Greguske - 1.1-5 +- Package up for Fedora rawhide + +* Sun May 01 2016 Neal Gompa - 1.1-3 +- Port to Python 3 and enable its subpackage +- Split config file to its own subpackage + * Thu Apr 07 2016 Dennis Gilmore - 1.1-2 - setup to make python3 down the road. - spec and srpm named python-multilib From 937faaad34a3148054c7021fc8fcc9e17a8d40f6 Mon Sep 17 00:00:00 2001 From: Jay Greguske Date: Wed, 29 Jun 2016 15:08:37 -0400 Subject: [PATCH 3/7] add the patch derr --- 001-python-six.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 001-python-six.patch diff --git a/001-python-six.patch b/001-python-six.patch new file mode 100644 index 0000000..b99c8bc --- /dev/null +++ b/001-python-six.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 5525b5b..9ed3e52 100755 +--- a/setup.py ++++ b/setup.py +@@ -23,6 +23,7 @@ setup( + license = "GPLv2", + url = "https://github.com/Zyzyx/python-multilib.git", + packages = packages, ++ install_requires = ['six'], + package_data = {'': ['README.md', 'LICENSE']}, + data_files = [('/etc', ['etc/multilib.conf'])], + test_suite = "tests", From d4c742f46397cf050426dea233fca0152758d6af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 10:32:30 +0000 Subject: [PATCH 4/7] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-multilib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-multilib.spec b/python-multilib.spec index 73fd1d8..81e636d 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,6 +1,6 @@ Name: python-multilib Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A module for determining if a package is multilib or not Group: Development/Libraries License: GPLv2 @@ -81,6 +81,9 @@ Requires: %{name}-conf = %{version}-%{release} %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.1-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Wed Jun 29 2016 Jay Greguske - 1.1-5 - Package up for Fedora rawhide From 06659c999c82348f72e4ab1b14da74e35d2fb4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:37 +0100 Subject: [PATCH 5/7] Rebuild for Python 3.6 --- python-multilib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-multilib.spec b/python-multilib.spec index 81e636d..00b1ba9 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,6 +1,6 @@ Name: python-multilib Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A module for determining if a package is multilib or not Group: Development/Libraries License: GPLv2 @@ -81,6 +81,9 @@ Requires: %{name}-conf = %{version}-%{release} %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.1-7 +- Rebuild for Python 3.6 + * Tue Jul 19 2016 Fedora Release Engineering - 1.1-6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 9320290e33793a238e9caab582470d464bc4bd82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 09:38:40 +0000 Subject: [PATCH 6/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-multilib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-multilib.spec b/python-multilib.spec index 00b1ba9..92bd540 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,6 +1,6 @@ Name: python-multilib Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A module for determining if a package is multilib or not Group: Development/Libraries License: GPLv2 @@ -81,6 +81,9 @@ Requires: %{name}-conf = %{version}-%{release} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 1.1-7 - Rebuild for Python 3.6 From d30cc04ca47cb516e9bdc6ee55574e86d1c97f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 2 Mar 2017 10:25:45 +0100 Subject: [PATCH 7/7] New upstream release with DNF support --- .gitignore | 1 + 001-python-six.patch | 12 ------------ python-multilib.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 001-python-six.patch diff --git a/.gitignore b/.gitignore index b60320b..83eb487 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-multilib-1.1.tar.gz +/python-multilib-1.2.tar.bz2 diff --git a/001-python-six.patch b/001-python-six.patch deleted file mode 100644 index b99c8bc..0000000 --- a/001-python-six.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.py b/setup.py -index 5525b5b..9ed3e52 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,6 +23,7 @@ setup( - license = "GPLv2", - url = "https://github.com/Zyzyx/python-multilib.git", - packages = packages, -+ install_requires = ['six'], - package_data = {'': ['README.md', 'LICENSE']}, - data_files = [('/etc', ['etc/multilib.conf'])], - test_suite = "tests", diff --git a/python-multilib.spec b/python-multilib.spec index 92bd540..458e61a 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,13 +1,13 @@ Name: python-multilib -Version: 1.1 -Release: 8%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: A module for determining if a package is multilib or not Group: Development/Libraries License: GPLv2 -URL: https://github.com/Zyzyx/%{name}/ -Source0: https://github.com/Zyzyx/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://pagure.io/releng/python-multilib +Source0: https://releases.pagure.org/releng/python-multilib/%{name}-%{version}.tar.bz2 + BuildArch: noarch -Patch01: 001-python-six.patch %global _description \ @@ -50,7 +50,6 @@ Requires: %{name}-conf = %{version}-%{release} %prep %setup -q -%patch01 -p1 %build %py2_build @@ -81,6 +80,10 @@ Requires: %{name}-conf = %{version}-%{release} %changelog +* Thu Mar 02 2017 Lubomír Sedlář - 1.2-1 +- New upstream version with support for DNF package objects +- Updated URL to point to new upstream on Pagure.io + * Sat Feb 11 2017 Fedora Release Engineering - 1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 56ec71e..1ee658f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc561564dcdafbca8a29f9d45366b435 python-multilib-1.1.tar.gz +SHA512 (python-multilib-1.2.tar.bz2) = 77e03fe81b7702ed7e00d43a8864bfa11b9bc1f522e513d0974cc323624ef6af89b18d516237de70e81ca292b7f420663c26c83b8830f5572763df7fa8894bdf