Update to last sucessful build
OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=761
This commit is contained in:
parent
becbdb4db8
commit
b09dd75d56
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1006d8a746f234f2040daf426732b1837cb856e7ef0a8e7fbc7c9da7422f1484
|
||||
size 4966467
|
||||
oid sha256:bb6ffa167221bd0c0619df4e346609de57d1b1e9b99ecd7e1f245ffec5a2836d
|
||||
size 4973236
|
||||
|
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 18 14:10:20 CEST 2011 - dmacvicar@suse.de
|
||||
|
||||
- Allow MediaCD to build against HAL or nothing
|
||||
if udev is not present
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 16 14:42:09 CEST 2011 - dmacvicar@suse.de
|
||||
|
||||
- forward port all changes to make it build in Code10
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 16 11:51:51 UTC 2011 - dmacvicar@suse.de
|
||||
|
||||
- make -Werror=format-security optional and used only if
|
||||
supported
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 15 01:13:47 CEST 2011 - ma@suse.de
|
||||
|
||||
- Update zypp-po.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 12 01:13:54 CEST 2011 - ma@suse.de
|
||||
|
||||
|
57
libzypp.spec
57
libzypp.spec
@ -37,7 +37,7 @@ BuildRequires: libxml2-devel
|
||||
BuildRequires: libproxy-devel
|
||||
|
||||
BuildRequires: libsatsolver-devel >= 0.14.17
|
||||
%if 0%{?suse_version}
|
||||
%if 0%{?suse_version} >= 1100
|
||||
%requires_eq satsolver-tools
|
||||
%else
|
||||
Requires: satsolver-tools
|
||||
@ -55,6 +55,9 @@ BuildRequires: expat-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: rpm-devel
|
||||
Requires: /usr/bin/uuidgen
|
||||
%if 0%{?suse_version} > 1020
|
||||
BuildRequires: hicolor-icon-theme
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora_version}
|
||||
@ -76,33 +79,44 @@ Requires: gpg2
|
||||
Requires: gnupg2
|
||||
%endif
|
||||
|
||||
%define min_aria_version 1.1.2
|
||||
# ---------------------------------------------------------------
|
||||
%if 0%{?suse_version} == 1110
|
||||
%if 0%{?suse_version} >= 1110
|
||||
# (almost) common codebase, but on SLES11-SP1 (according to Rudi
|
||||
# suse_version == 1110) we have a patched libcurl-7.19.0-11.22,
|
||||
# and no aria2. Furthermore SLE may use it's own set of .po files
|
||||
# from po/sle-zypp-po.tar.bz2.
|
||||
|
||||
# this check should use 7.19.0 if SLE and 7.19.4 if not (backported
|
||||
# CURLOPT_REDIR_PROTOCOLS)
|
||||
%define min_curl_version 7.19.0-11.22
|
||||
#%define min_curl_version 7.19.4
|
||||
%define use_translation_set sle-zypp
|
||||
# ---------------------------------------------------------------
|
||||
%else
|
||||
# ---------------------------------------------------------------
|
||||
# This is >=11.2 (better not sles11-sp1)
|
||||
# need CURLOPT_REDIR_PROTOCOLS:
|
||||
%define min_curl_version 7.19.4
|
||||
%endif
|
||||
# No requirement, but as we'd use it in case it is present,
|
||||
# check for a sufficient version:
|
||||
%define min_aria_version 1.1.2
|
||||
Conflicts: aria2 < %{min_aria_version}
|
||||
%else
|
||||
# Code10 still has this define
|
||||
%if 0%{?sles_version}
|
||||
%define use_translation_set sle-zypp
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
%if 0%{?suse_version}
|
||||
Requires: libcurl4 >= %{min_curl_version}
|
||||
%else
|
||||
Requires: libcurl >= %{min_curl_version}
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1100
|
||||
# Code11+
|
||||
BuildRequires: libcurl-devel >= %{min_curl_version}
|
||||
Requires: libcurl4 >= %{min_curl_version}
|
||||
%else
|
||||
# Code10
|
||||
BuildRequires: curl-devel
|
||||
%endif
|
||||
%else
|
||||
# Other distros (Fedora)
|
||||
BuildRequires: libcurl-devel >= %{min_curl_version}
|
||||
Requires: libcurl >= %{min_curl_version}
|
||||
%endif
|
||||
|
||||
%description
|
||||
Package, Patch, Pattern, and Product Management
|
||||
@ -131,8 +145,19 @@ Requires: boost-devel
|
||||
Requires: libstdc++-devel
|
||||
Requires: libudev-devel
|
||||
Requires: cmake
|
||||
Requires: libcurl-devel >= %{min_curl_version}
|
||||
%if 0%{?suse_version}
|
||||
%if 0%{?suse_version} >= 1100
|
||||
# Code11+
|
||||
Requires: libcurl-devel >= %{min_curl_version}
|
||||
%else
|
||||
# Code10
|
||||
Requires: curl-devel
|
||||
%endif
|
||||
%else
|
||||
# Other distros (Fedora)
|
||||
Requires: libcurl-devel >= %{min_curl_version}
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1100
|
||||
%requires_ge libsatsolver-devel
|
||||
%else
|
||||
Requires: libsatsolver-devel
|
||||
|
Loading…
Reference in New Issue
Block a user