From 141acf062faa85872b64acd3c054720a8953bd2ee14456ba2c3517529ed7ef8c Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 11 Jan 2017 14:30:13 +0000 Subject: [PATCH 1/6] - change service version generator to use "1.0.git" instead of "1.0git" OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=21 --- _service | 2 +- python-rpm-macros.changes | 5 +++++ python-rpm-macros.spec | 9 ++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/_service b/_service index f9ebf73..b307e17 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ https://github.com/openSUSE/multipython-macros.git multipython-macros - 1.0git + 1.0.git diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index af30223..32157b6 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 11 14:28:48 UTC 2017 - jmatejek@suse.com + +- change service version generator to use "1.0.git" instead of "1.0git" + ------------------------------------------------------------------- Fri Jan 6 17:36:58 UTC 2017 - jmatejek@suse.com diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 6980a28..0053094 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm-macros # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-rpm-macros -Version: 1.0git.1483874658.ead0b0b +Version: 1.0.git.1483874658.ead0b0b Release: 0 -License: WTFPL Summary: RPM macros for building of Python modules +License: WTFPL Url: https://github.com/opensuse/multipython-macros Source: multipython-macros-%{version}.tar.bz2 # Fedora compatibility @@ -50,3 +51,5 @@ install -m 644 macros.python_all %{buildroot}%{_sysconfdir}/rpm %files %defattr(-,root,root) %{_sysconfdir}/rpm/macros.python_all + +%changelog From 37936d93396126c305d3d2ac759b0e6c92e4128f649ca834e6f42631c8833278 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 11 Jan 2017 14:31:44 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=22 --- python-rpm-macros.spec | 55 ------------------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 python-rpm-macros.spec diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec deleted file mode 100644 index 0053094..0000000 --- a/python-rpm-macros.spec +++ /dev/null @@ -1,55 +0,0 @@ -# -# spec file for package python-rpm-macros -# -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: python-rpm-macros -Version: 1.0.git.1483874658.ead0b0b -Release: 0 -Summary: RPM macros for building of Python modules -License: WTFPL -Url: https://github.com/opensuse/multipython-macros -Source: multipython-macros-%{version}.tar.bz2 -# Fedora compatibility -Provides: python2-rpm-macros -Provides: python3-rpm-macros -#!BuildIgnore: python-rpm-macros - -BuildArch: noarch - -%description -This package contains SUSE RPM macros for Python build automation. -You should BuildRequire this package unless you are sure that you -are only building for distros newer than Leap 42.2 - -%prep -%setup -q -n multipython-macros-%{version} -%if 0%{?suse_version} < 1330 -mv macros-default-pythons macros/035-default-pythons -%endif - -%build -./compile-macros.sh - -%install -mkdir -p %{buildroot}%{_sysconfdir}/rpm -install -m 644 macros.python_all %{buildroot}%{_sysconfdir}/rpm - -%files -%defattr(-,root,root) -%{_sysconfdir}/rpm/macros.python_all - -%changelog From c02376f89eab6d55569d7ef4d83140fab5d2d50dd9660c49845edd4027922ef0 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 11 Jan 2017 14:33:56 +0000 Subject: [PATCH 3/6] revert whatever the heck osc did right now OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=23 --- python-rpm-macros.spec | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 python-rpm-macros.spec diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec new file mode 100644 index 0000000..6980a28 --- /dev/null +++ b/python-rpm-macros.spec @@ -0,0 +1,52 @@ +# +# spec file for package python-rpm-macros +# +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +Name: python-rpm-macros +Version: 1.0git.1483874658.ead0b0b +Release: 0 +License: WTFPL +Summary: RPM macros for building of Python modules +Url: https://github.com/opensuse/multipython-macros +Source: multipython-macros-%{version}.tar.bz2 +# Fedora compatibility +Provides: python2-rpm-macros +Provides: python3-rpm-macros +#!BuildIgnore: python-rpm-macros + +BuildArch: noarch + +%description +This package contains SUSE RPM macros for Python build automation. +You should BuildRequire this package unless you are sure that you +are only building for distros newer than Leap 42.2 + +%prep +%setup -q -n multipython-macros-%{version} +%if 0%{?suse_version} < 1330 +mv macros-default-pythons macros/035-default-pythons +%endif + +%build +./compile-macros.sh + +%install +mkdir -p %{buildroot}%{_sysconfdir}/rpm +install -m 644 macros.python_all %{buildroot}%{_sysconfdir}/rpm + +%files +%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.python_all From 8304758f33a9165dafc5a686661e1e6f666fadf635df3b03b5a0f7b9fcf3bb76 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Tue, 7 Feb 2017 16:30:08 +0000 Subject: [PATCH 4/6] Accepting request 455015 from home:jengelh:branches:devel:languages:python:Factory - Set RPM group OBS-URL: https://build.opensuse.org/request/show/455015 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=24 --- python-rpm-macros.changes | 5 +++++ python-rpm-macros.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 32157b6..b19feee 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 6 14:30:38 UTC 2017 - jengelh@inai.de + +- Set RPM group + ------------------------------------------------------------------- Wed Jan 11 14:28:48 UTC 2017 - jmatejek@suse.com diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 6980a28..8f3ce31 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -19,6 +19,7 @@ Name: python-rpm-macros Version: 1.0git.1483874658.ead0b0b Release: 0 License: WTFPL +Group: Development/Tools/Other Summary: RPM macros for building of Python modules Url: https://github.com/opensuse/multipython-macros Source: multipython-macros-%{version}.tar.bz2 From e118e8db5abd5378802ca069f49473d4188cd413d390c1146b701612af12e2ca Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Tue, 7 Feb 2017 16:33:09 +0000 Subject: [PATCH 5/6] Accepting request 455307 from devel:languages:python:singlespec - introduce %python_prefix OBS-URL: https://build.opensuse.org/request/show/455307 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=25 --- multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 | 3 +++ multipython-macros-1.0git.1483874658.ead0b0b.tar.bz2 | 3 --- python-rpm-macros.changes | 5 +++++ python-rpm-macros.spec | 10 ++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 delete mode 100644 multipython-macros-1.0git.1483874658.ead0b0b.tar.bz2 diff --git a/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 b/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 new file mode 100644 index 0000000..6f3e309 --- /dev/null +++ b/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e317a1b11c411641c081af535fa651345a461e2fd620db17d56c7b4f1d0f15 +size 10757 diff --git a/multipython-macros-1.0git.1483874658.ead0b0b.tar.bz2 b/multipython-macros-1.0git.1483874658.ead0b0b.tar.bz2 deleted file mode 100644 index 2a5d2db..0000000 --- a/multipython-macros-1.0git.1483874658.ead0b0b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:617f47150e8ec7e28d9fa4be3e532c04cc3bba91034ba532022a34596e2b9d03 -size 10666 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index b19feee..46a8369 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 7 16:31:04 UTC 2017 - jmatejek@suse.com + +- introduce %python_prefix + ------------------------------------------------------------------- Mon Feb 6 14:30:38 UTC 2017 - jengelh@inai.de diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 8f3ce31..3c1ee74 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package python-rpm-macros # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-rpm-macros -Version: 1.0git.1483874658.ead0b0b +Version: 1.0.git.1486390382.fb829ad Release: 0 +Summary: RPM macros for building of Python modules License: WTFPL Group: Development/Tools/Other -Summary: RPM macros for building of Python modules Url: https://github.com/opensuse/multipython-macros Source: multipython-macros-%{version}.tar.bz2 # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros #!BuildIgnore: python-rpm-macros - BuildArch: noarch %description @@ -51,3 +51,5 @@ install -m 644 macros.python_all %{buildroot}%{_sysconfdir}/rpm %files %defattr(-,root,root) %{_sysconfdir}/rpm/macros.python_all + +%changelog From e5fe30145b454d7f54b5c153443a23fea7fc06f3f4b301938d3a3b1f73a0eb65 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 13 Feb 2017 14:53:41 +0000 Subject: [PATCH 6/6] - update service, use repository and tarball name "python-rpm-macros" OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=26 --- _service | 5 ++--- multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 | 3 --- python-rpm-macros-1.0.git.1486997542.e9fcc29.tar.bz2 | 3 +++ python-rpm-macros.changes | 5 +++++ python-rpm-macros.spec | 6 +++--- 5 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 create mode 100644 python-rpm-macros-1.0.git.1486997542.e9fcc29.tar.bz2 diff --git a/_service b/_service index b307e17..e13ed99 100644 --- a/_service +++ b/_service @@ -2,10 +2,9 @@ git - - https://github.com/openSUSE/multipython-macros.git + https://github.com/openSUSE/python-rpm-macros.git - multipython-macros + python-rpm-macros 1.0.git diff --git a/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 b/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 deleted file mode 100644 index 6f3e309..0000000 --- a/multipython-macros-1.0.git.1486390382.fb829ad.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17e317a1b11c411641c081af535fa651345a461e2fd620db17d56c7b4f1d0f15 -size 10757 diff --git a/python-rpm-macros-1.0.git.1486997542.e9fcc29.tar.bz2 b/python-rpm-macros-1.0.git.1486997542.e9fcc29.tar.bz2 new file mode 100644 index 0000000..ff883b5 --- /dev/null +++ b/python-rpm-macros-1.0.git.1486997542.e9fcc29.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00b24f2bf4442047400dd1f2f10a8c56227ec0362929ef9f79d879442ae2be9f +size 10778 diff --git a/python-rpm-macros.changes b/python-rpm-macros.changes index 46a8369..001f873 100644 --- a/python-rpm-macros.changes +++ b/python-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 14:46:25 UTC 2017 - jmatejek@suse.com + +- update service, use repository and tarball name "python-rpm-macros" + ------------------------------------------------------------------- Tue Feb 7 16:31:04 UTC 2017 - jmatejek@suse.com diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 3c1ee74..0ac2b2b 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -17,13 +17,13 @@ Name: python-rpm-macros -Version: 1.0.git.1486390382.fb829ad +Version: 1.0.git.1486997542.e9fcc29 Release: 0 Summary: RPM macros for building of Python modules License: WTFPL Group: Development/Tools/Other Url: https://github.com/opensuse/multipython-macros -Source: multipython-macros-%{version}.tar.bz2 +Source: python-rpm-macros-%{version}.tar.bz2 # Fedora compatibility Provides: python2-rpm-macros Provides: python3-rpm-macros @@ -36,7 +36,7 @@ You should BuildRequire this package unless you are sure that you are only building for distros newer than Leap 42.2 %prep -%setup -q -n multipython-macros-%{version} +%setup -q %if 0%{?suse_version} < 1330 mv macros-default-pythons macros/035-default-pythons %endif