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 363226f..3043583 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 @@ -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 @@ -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} @@ -77,7 +80,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