rpm/osc
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 403699 from openSUSE:Tools

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/403699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=112
This commit is contained in:
Dominique Leuenberger 2016-06-25 00:21:25 +00:00 committed by Git OBS Bridge
commit 6f92446882
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc.changes
View File

@ -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 Mon Apr 11 08:50:29 UTC 2016 - adrian@suse.de

9
osc.spec
View File

@ -32,7 +32,7 @@ BuildRequires: python-urlgrabber
Requires: python-urlgrabber Requires: python-urlgrabber
%endif %endif
BuildRequires: python-devel BuildRequires: python-devel
%if 0%{?mandriva_version} %if 0%{?mandriva_version} || 0%{?mageia}
BuildRequires: python-rpm BuildRequires: python-rpm
Requires: python-rpm Requires: python-rpm
%else %else
@ -48,7 +48,7 @@ Requires: python-elementtree
BuildRequires: python-xml BuildRequires: python-xml
Requires: python-xml Requires: python-xml
%endif %endif
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%if 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
@ -64,6 +64,9 @@ Recommends: obs-service-download_files
Recommends: obs-service-format_spec_file Recommends: obs-service-format_spec_file
Recommends: obs-service-source_validator Recommends: obs-service-source_validator
%endif %endif
%else
# non-suse
BuildArch: noarch
%endif %endif
# needed for storing credentials in kwallet/gnome-keyring # needed for storing credentials in kwallet/gnome-keyring
%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} %if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
@ -77,7 +80,7 @@ Requires: python-elementtree
BuildRequires: python-elementtree BuildRequires: python-elementtree
Requires: python-elementtree Requires: python-elementtree
%endif %endif
%if 0%{?suse_version}%{?mandriva_version} %if 0%{?suse_version} || 0%{?mandriva_version} || 0%{?mageia}
BuildRequires: python-m2crypto BuildRequires: python-m2crypto
Requires: python-m2crypto > 0.19 Requires: python-m2crypto > 0.19
%else %else