From 2619353e8c0af9c65f7e1818f7732e9f2ce98e577b44976ba1e4b3f296e1c2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 14:34:07 +0000 Subject: [PATCH 1/7] make fedora builds noarch as well OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=215 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 363226f..934bf18 100644 --- a/osc.spec +++ b/osc.spec @@ -48,7 +48,7 @@ Requires: python-elementtree BuildRequires: python-xml Requires: python-xml %endif -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} > 1110 || 0%{?fedora_version} BuildArch: noarch %endif %if 0%{?suse_version} > 1000 From 3c677ee8b31a0f89539549744b459146d82c4f662711d710ce689abd5a5984c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 14:35:10 +0000 Subject: [PATCH 2/7] everywhere, except dead old suse versions OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=216 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 934bf18..ad17966 100644 --- a/osc.spec +++ b/osc.spec @@ -48,7 +48,7 @@ Requires: python-elementtree BuildRequires: python-xml Requires: python-xml %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 BuildArch: noarch %endif %if 0%{?suse_version} > 1000 From 1793a1e77ad6cc5e33ea8d3b2e999571c74711293c759469796d1dba388c79f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 14:40:08 +0000 Subject: [PATCH 3/7] fix for mageia OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=217 --- osc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc.spec b/osc.spec index ad17966..cd081ab 100644 --- a/osc.spec +++ b/osc.spec @@ -32,7 +32,7 @@ BuildRequires: python-urlgrabber Requires: python-urlgrabber %endif BuildRequires: python-devel -%if 0%{?mandriva_version} +%if 0%{?mandriva_version} || 0%{?mageia} BuildRequires: python-rpm Requires: python-rpm %else @@ -77,7 +77,7 @@ Requires: python-elementtree BuildRequires: python-elementtree Requires: python-elementtree %endif -%if 0%{?suse_version}%{?mandriva_version} +%if 0%{?suse_version} || 0%{?mandriva_version} || 0%{?mageia} BuildRequires: python-m2crypto Requires: python-m2crypto > 0.19 %else From 7fd36781fc2458903be4720b02930291fc8c657d3fa6e01bef535f1ece1e4f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 14:52:25 +0000 Subject: [PATCH 4/7] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=218 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index cd081ab..5de7d77 100644 --- a/osc.spec +++ b/osc.spec @@ -48,7 +48,7 @@ Requires: python-elementtree BuildRequires: python-xml Requires: python-xml %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} == 0 && 0%{?suse_version} <= 1110 BuildArch: noarch %endif %if 0%{?suse_version} > 1000 From 6016d103f0b1b0392980516250b1dd1750ab43301890904ba6a9d92eec236a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 14:52:56 +0000 Subject: [PATCH 5/7] ups2 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=219 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 5de7d77..dc4742d 100644 --- a/osc.spec +++ b/osc.spec @@ -48,7 +48,7 @@ Requires: python-elementtree BuildRequires: python-xml Requires: python-xml %endif -%if 0%{?suse_version} == 0 && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} <= 1110 BuildArch: noarch %endif %if 0%{?suse_version} > 1000 From 3684f0d1fa7ab6bc093784f1e82c7678d1b07c8e726cfb3c0faffe81c2435b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 2 Jun 2016 16:09:11 +0000 Subject: [PATCH 6/7] grmbl OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=220 --- osc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osc.spec b/osc.spec index dc4742d..2c475d6 100644 --- a/osc.spec +++ b/osc.spec @@ -64,6 +64,9 @@ Recommends: obs-service-download_files Recommends: obs-service-format_spec_file Recommends: obs-service-source_validator %endif +%else +# non-suse +BuildArch: noarch %endif # needed for storing credentials in kwallet/gnome-keyring %if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} From 5f92e87a9d2a28bc615ffe2945bba1b2966665e57da588811f41b5bc7128dcf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 13 Jun 2016 12:49:12 +0000 Subject: [PATCH 7/7] Accepting request 400955 from home:Marcus_H:branches:openSUSE:Tools - make a noarch package if suse_version >= 1120 (since 1120 python noarch packages are supported) OBS-URL: https://build.opensuse.org/request/show/400955 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=221 --- osc.changes | 6 ++++++ osc.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/osc.changes b/osc.changes index f2fa073..759eeae 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 10 12:09:42 UTC 2016 - suse-tux@gmx.de + +- make a noarch package if suse_version >= 1120 (since 1120 python + noarch packages are supported) + ------------------------------------------------------------------- Mon Apr 11 08:50:29 UTC 2016 - adrian@suse.de diff --git a/osc.spec b/osc.spec index 2c475d6..3043583 100644 --- a/osc.spec +++ b/osc.spec @@ -48,7 +48,7 @@ Requires: python-elementtree BuildRequires: python-xml Requires: python-xml %endif -%if 0%{?suse_version} <= 1110 +%if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %if 0%{?suse_version} > 1000