diff --git a/libzypp-9.1.2.tar.bz2 b/libzypp-9.1.2.tar.bz2 deleted file mode 100644 index f210904..0000000 --- a/libzypp-9.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a196185351e393dd62e080001bc45223b2719d6804c801ec30adff2960e103ea -size 4979403 diff --git a/libzypp-9.8.0.tar.bz2 b/libzypp-9.8.0.tar.bz2 new file mode 100644 index 0000000..27f6217 --- /dev/null +++ b/libzypp-9.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d136a93f4b93f358d25b5e3aaadd762403512832046d87b5ae2f9cae82f19cb +size 4694585 diff --git a/libzypp.changes b/libzypp.changes index 89364f0..9439574 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,99 @@ +------------------------------------------------------------------- +Thu Jun 9 09:34:51 CEST 2011 - ma@suse.de + +- Fix missing return value. + +------------------------------------------------------------------- +Wed Jun 8 12:58:54 CEST 2011 - ma@suse.de + +- Simplify ZYppCommitResult by using filtered Transaction::action_iterator. +- version 9.8.0 (8) + +------------------------------------------------------------------- +Tue Jun 7 14:12:35 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Jun 7 12:42:20 CEST 2011 - ma@suse.de + +- Fix transaction ORDER_BY_MEDIANR. +- version 9.7.0 (5) + +------------------------------------------------------------------- +Fri Jun 3 23:12:05 CEST 2011 - ma@suse.de + +- Basic commit plugins implemented. They may be used to implement pre/post + commit actions like taking file system snapshots (fate#303699) +- version 9.6.0 (5) + +------------------------------------------------------------------- +Tue May 31 17:27:45 CEST 2011 - ma@suse.de + +- Do commit based on sat::Transaction. +- version 9.5.0 (5) + +------------------------------------------------------------------- +Tue May 31 12:09:17 CEST 2011 - ma@suse.de + +- Assert rpm database directory is created before rpmtsInitDB is + called (bnc#697115) + +------------------------------------------------------------------- +Tue May 31 11:46:57 CEST 2011 - dheidler@suse.de + +- fix var definition order in PackageProvider +- fix operator~ return datatype for flags (ctor is explicit) +- add method interactiveFlags to Patch describing what makes it + interactive +- version 9.4.0 (3) + +------------------------------------------------------------------- +Tue May 31 10:12:12 CEST 2011 - ma@suse.de + +- Recommend 'lsof' (for zypper ps) (bnc#694427, bnc#684466) + +------------------------------------------------------------------- +Mon May 30 17:14:14 CEST 2011 - dheidler@suse.de + +- Switch patch interactive-check to flags +- version 9.3.0 (3) + +------------------------------------------------------------------- +Sun May 29 01:13:42 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri May 27 17:02:05 CEST 2011 - ma@suse.de + +- fix specfile to handle sles translations if available + +------------------------------------------------------------------- +Fri May 27 09:51:13 CEST 2011 - ma@suse.de + +- Avoid using #elifdef directive. + +------------------------------------------------------------------- +Thu May 26 01:13:43 CEST 2011 - ma@suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Wed May 25 09:22:28 CEST 2011 - ma@suse.de + +- Add a fallback gnome-packagekit updater in package-manager (bnc#667504) +- Backport changelog entries from SLE11-SP1 branch. Bugs mentioned here + were either fixed without bnc# or do not apply to this branch. This is + to make the changelog checker happy: + - Set proper defaults for service repos (bnc#673943) + +------------------------------------------------------------------- +Tue May 24 12:43:32 CEST 2011 - dheidler@suse.de + +- add option ignore_reboot_flag to Patch::interactive (bnc#665853) +- version 9.2.0 (2) + ------------------------------------------------------------------- Mon May 23 16:12:32 CEST 2011 - dheidler@suse.de @@ -37,12 +133,12 @@ Wed May 18 14:10:20 CEST 2011 - dmacvicar@suse.de ------------------------------------------------------------------- Mon May 16 14:42:09 CEST 2011 - dmacvicar@suse.de -- forward port all changes to make it build in Code10 +- 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 +- make -Werror=format-security optional and used only if supported ------------------------------------------------------------------- @@ -81,7 +177,7 @@ Tue Apr 12 18:49:32 CEST 2011 - dheidler@suse.de ------------------------------------------------------------------- Tue Apr 5 12:08:27 CEST 2011 - ma@suse.de -- Switch ResPoolProxy to use multimap in order to allow iteration +- 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. diff --git a/libzypp.spec b/libzypp.spec index 59650e1..8e7fab9 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -1,40 +1,38 @@ # # 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 Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 9.1.2 -Release: 1 +Version: 9.8.0 +Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Provides: yast2-packagemanager Obsoletes: yast2-packagemanager %if 0%{?suse_version} Recommends: logrotate +# lsof is used for 'zypper ps': +Recommends: lsof %endif BuildRequires: cmake BuildRequires: openssl-devel +%if 0%{?suse_version} >= 1130 BuildRequires: libudev-devel +%else +BuildRequires: hal-devel +%endif BuildRequires: boost-devel BuildRequires: dejagnu BuildRequires: doxygen @@ -98,15 +96,6 @@ Requires: gnupg2 # 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 -# No requirement, but as we'd use it in case it is present, -# check for a sufficient version: -%else -# Code10 still has this define -%if 0%{?sles_version} -%define use_translation_set sle-zypp -%endif %endif # --------------------------------------------------------------- @@ -141,7 +130,6 @@ Authors: Ladislav Slezak %package devel - Requires: libzypp = %{version} Requires: libxml2-devel Requires: openssl-devel @@ -152,19 +140,23 @@ Requires: bzip2 Requires: popt-devel Requires: boost-devel Requires: libstdc++-devel +%if 0%{?suse_version} >= 1130 Requires: libudev-devel +%else +Requires: hal-devel +%endif Requires: cmake %if 0%{?suse_version} %if 0%{?suse_version} >= 1100 # Code11+ -Requires: libcurl-devel >= %{min_curl_version} +Requires: libcurl-devel >= %{min_curl_version} %else # Code10 -Requires: curl-devel +Requires: curl-devel %endif %else # Other distros (Fedora) -Requires: libcurl-devel >= %{min_curl_version} +Requires: libcurl-devel >= %{min_curl_version} %endif %if 0%{?suse_version} >= 1100 %requires_ge libsatsolver-devel @@ -198,12 +190,19 @@ mkdir build cd build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" +unset TRANSLATION_SET +# SLE11-* might want its own translation set: +%if 0%{?suse_version} == 1110 +if [ -f ../po/sle-zypp-po.tar.bz ]; then + export TRANSLATION_SET=sle-zypp +fi +%endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DDOC_INSTALL_DIR=%{_docdir} \ -DLIB=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ - %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \ + -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \ .. make %{?_smp_mflags} VERBOSE=1 make -C doc/autodoc %{?_smp_mflags} @@ -244,6 +243,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 @@ -308,6 +308,7 @@ if is_old ${LOCKSFILE} done fi + %postun -p /sbin/ldconfig %clean