diff --git a/libzypp-8.12.2.tar.bz2 b/libzypp-8.12.2.tar.bz2 deleted file mode 100644 index a2d8faf..0000000 --- a/libzypp-8.12.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea364c3b542ab49e828cc8f519c7072f57a672c1db22a7194cc74a051fdf7778 -size 4955115 diff --git a/libzypp-9.1.2.tar.bz2 b/libzypp-9.1.2.tar.bz2 new file mode 100644 index 0000000..f210904 --- /dev/null +++ b/libzypp-9.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a196185351e393dd62e080001bc45223b2719d6804c801ec30adff2960e103ea +size 4979403 diff --git a/libzypp.changes b/libzypp.changes index c84f62c..89364f0 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,117 @@ +------------------------------------------------------------------- +Mon May 23 16:12:32 CEST 2011 - dheidler@suse.de + +- respect patch content license when determinating interactive status +- version 9.1.2 (1) + +------------------------------------------------------------------- +Mon May 23 12:05:10 CEST 2011 - ma@suse.de + +- More rpm-4.9 fixes +- Disable rpm V3toV4 conversion while not working with rpm 4.9 + +------------------------------------------------------------------- +Sun May 22 01:14:21 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri May 20 17:11:10 CEST 2011 - ma@suse.de + +- Fix for rpm-4.9 +- version 9.1.1 (1) + +------------------------------------------------------------------- +Fri May 20 13:43:38 CEST 2011 - ma@suse.de + +- Disable use if rpm-4.4 legacy interface (dropped in 4.9) (bnc#691089) +- Fix poolquery handling repo restrictions correctly. (bnc#661976) +- version 9.1.0 (1) + +------------------------------------------------------------------- +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 + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri May 6 13:22:35 CEST 2011 - dheidler@suse.de + +- delete old metadata temp directories +- version 9.0.3 (0) + +------------------------------------------------------------------- +Wed Apr 27 17:17:00 CEST 2011 - dheidler@suse.de + +- fix max_concurrent_connections option in MultiCurl (bnc#596089) +- version 9.0.2 (0) + +------------------------------------------------------------------- +Sun Apr 17 01:13:40 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Apr 12 18:49:32 CEST 2011 - dheidler@suse.de + +- check for permissions before writing (fixes bnc#683509) +- version 9.0.1 (0) + +------------------------------------------------------------------- +Tue Apr 5 12:08:27 CEST 2011 - ma@suse.de + +- Switch ResPoolProxy to use multimap in order to allow iteration + of all Selectables of all kinds. +- Add upper/lower_bound iteration to MapKVIterator. +- Add stream output for multimap/set. +- version 9.0.0 (0) + +------------------------------------------------------------------- +Mon Apr 4 15:08:08 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Apr 4 15:04:47 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Apr 4 15:03:55 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Mar 10 01:13:39 CET 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Mar 6 01:13:41 CET 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + ------------------------------------------------------------------- Wed Feb 16 14:24:27 UTC 2011 - dmacvicar@suse.de diff --git a/libzypp.spec b/libzypp.spec index 8a6730e..3ac827b 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -1,30 +1,22 @@ # # spec file for package libzypp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. # -# 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/ # # norootforbuild - Name: libzypp -License: GPLv2+ +License: GPLv2 Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 8.12.2 -Release: 1 +Version: 9.1.2 +Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Provides: yast2-packagemanager @@ -45,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 @@ -63,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} @@ -84,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 @@ -127,7 +133,6 @@ Authors: Ladislav Slezak %package devel -License: GPLv2+ Requires: libzypp = %{version} Requires: libxml2-devel Requires: openssl-devel @@ -140,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 @@ -198,7 +214,11 @@ rm -rf "$RPM_BUILD_ROOT" cd build make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT +%if 0%{?fedora_version} +ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d +%else mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d +%endif mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins @@ -215,6 +235,7 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT cd .. %{find_lang} zypp + %post /sbin/ldconfig if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi @@ -279,6 +300,7 @@ if is_old ${LOCKSFILE} done fi + %postun -p /sbin/ldconfig %clean @@ -287,7 +309,11 @@ rm -rf "$RPM_BUILD_ROOT" %files -f zypp.lang %defattr(-,root,root) %dir %{_sysconfdir}/zypp +%if 0%{?fedora_version} +%{_sysconfdir}/zypp/repos.d +%else %dir %{_sysconfdir}/zypp/repos.d +%endif %dir %{_sysconfdir}/zypp/services.d %config(noreplace) %{_sysconfdir}/zypp/zypp.conf %config(noreplace) %{_sysconfdir}/zypp/systemCheck