diff --git a/libzypp-5.16.1.tar.bz2 b/libzypp-5.16.1.tar.bz2 deleted file mode 100644 index dc09d37..0000000 --- a/libzypp-5.16.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4e03cf5976dab51fda1c4aecafc6daabf2ca15f0c2ed0659fe6dc897fd5b816 -size 3534948 diff --git a/libzypp-5.17.0.tar.bz2 b/libzypp-5.17.0.tar.bz2 new file mode 100644 index 0000000..1dc40f0 --- /dev/null +++ b/libzypp-5.17.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52230937e78ddb8b1e913e1dd001d4604204d3b79fc88f8b16f65cc84832311c +size 4620296 diff --git a/libzypp-bnc-409927.patch b/libzypp-bnc-409927.patch deleted file mode 100644 index 26f38df..0000000 --- a/libzypp-bnc-409927.patch +++ /dev/null @@ -1,33 +0,0 @@ -Only in libzypp-5.16.1.orig/: libzypp-5.16.1 -diff -ur libzypp-5.16.1.orig//zypp/PathInfo.cc libzypp-5.16.1//zypp/PathInfo.cc ---- libzypp-5.16.1.orig//zypp/PathInfo.cc 2008-10-16 16:11:34.000000000 +0200 -+++ libzypp-5.16.1//zypp/PathInfo.cc 2008-10-16 16:23:24.000000000 +0200 -@@ -598,6 +598,15 @@ - // METHOD NAME : readdir - // METHOD TYPE : int - // -+ -+ bool DirEntry::operator==( const DirEntry &rhs ) const -+ { -+ // if one of the types is not known, use the name only -+ if ( type == FT_NOT_AVAIL || rhs.type == FT_NOT_AVAIL ) -+ return ( name == rhs.name ); -+ return ((name == rhs.name ) && (type == rhs.type)); -+ } -+ - int readdir( DirContent & retlist, const Pathname & path, - bool dots, PathInfo::Mode statmode ) - { -diff -ur libzypp-5.16.1.orig//zypp/PathInfo.h libzypp-5.16.1//zypp/PathInfo.h ---- libzypp-5.16.1.orig//zypp/PathInfo.h 2008-10-16 16:11:34.000000000 +0200 -+++ libzypp-5.16.1//zypp/PathInfo.h 2008-10-16 16:18:35.000000000 +0200 -@@ -490,8 +490,7 @@ - , type( type_r ) - {} - -- bool operator==( const DirEntry &rhs ) const -- { return ((name == rhs.name ) && (type == rhs.type)); } -+ bool operator==( const DirEntry &rhs ) const; - }; - - /** Returned by readdir. */ diff --git a/libzypp-r11473.diff b/libzypp-r11473.diff deleted file mode 100644 index f98fc6f..0000000 --- a/libzypp-r11473.diff +++ /dev/null @@ -1,30 +0,0 @@ -Index: zypp/PathInfo.cc -=================================================================== ---- zypp/PathInfo.cc (Revision 11472) -+++ zypp/PathInfo.cc (Revision 11473) -@@ -18,9 +18,6 @@ - #include - #include - --#include --#include -- - #include "zypp/base/Logger.h" - #include "zypp/base/String.h" - #include "zypp/base/IOStream.h" -@@ -598,13 +595,13 @@ - // METHOD NAME : readdir - // METHOD TYPE : int - // -- -+ - bool DirEntry::operator==( const DirEntry &rhs ) const - { - // if one of the types is not known, use the name only - if ( type == FT_NOT_AVAIL || rhs.type == FT_NOT_AVAIL ) - return ( name == rhs.name ); -- return ((name == rhs.name ) && (type == rhs.type)); -+ return ((name == rhs.name ) && (type == rhs.type)); - } - - int readdir( DirContent & retlist, const Pathname & path, diff --git a/libzypp.changes b/libzypp.changes index 9ad8a9a..162b023 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,14 +1,59 @@ ------------------------------------------------------------------- -Fri Oct 24 12:39:06 CEST 2008 - coolo@suse.de +Fri Oct 24 10:29:19 CEST 2008 - schubi@suse.de -- hotfix against broken boost includes +- Taking "unlock" instead of setTransact(false) in the solutions (bnc #436923) +- revision 11468 +- version 5.17.0 (17) ------------------------------------------------------------------- -Mon Oct 20 21:01:52 CEST 2008 - mrueckert@suse.de +Wed Oct 22 14:33:10 CEST 2008 - ma@suse.de -- fix rpmlint warnings -- use requires_eq -- dont use deprecated macros +- For retrieving a product license fall back to license.tar.gz. (bnc #372386) +- revision 11447 + +------------------------------------------------------------------- +Wed Oct 22 14:16:33 CEST 2008 - dmacvicar@suse.de + +- move anonymous unique id to a private http header + X-ZYpp-AnonymousUniqueId (bnc#431571 ) + +------------------------------------------------------------------- +Wed Oct 22 12:58:35 CEST 2008 - ma@suse.de + +- Adapt to satsolver-0.12 API. +- Add Locale:: bestMatch to find the best match within a set of + available Locales. +- revision 11441 + +------------------------------------------------------------------- +Mon Oct 20 16:44:58 CEST 2008 - ma@suse.de + +- RepoInfo: Add methods to handle repository licenses. (bnc #372386) +- revision 11419 + +------------------------------------------------------------------- +Mon Oct 20 16:39:41 CEST 2008 - ma@suse.de + +- Adapt to changed satsolver dataiterator API. +- revision 11418 + +------------------------------------------------------------------- +Fri Oct 17 18:31:47 CEST 2008 - ma@suse.de + +- Secure download of license file on repo refresh (bnc #372386) +- revision 11398 + +------------------------------------------------------------------- +Fri Oct 17 17:26:25 CEST 2008 - ma@suse.de + +- Call 'repo2solv.sh -o' instead of using output redirection. (bnc #420046) +- revision 11397 + +------------------------------------------------------------------- +Thu Oct 16 17:57:15 CEST 2008 - jkupec@suse.cz + +- repository license methods added to RepoManager (bnc #372386) +- revision 11377 ------------------------------------------------------------------- Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de @@ -16,6 +61,16 @@ Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de - don't take into account stat information when looking for remote SHA1SUMS (part of bnc#409927) +------------------------------------------------------------------- +Wed Oct 15 18:01:48 CEST 2008 - jkupec@suse.cz + +- MediaSetAccess::provideOptionalFile() added +- revision 11369 + +------------------------------------------------------------------- +Wed Oct 15 18:01:48 CEST 2008 - jkupec@suse.cz +- version 5.16.1 (16) + ------------------------------------------------------------------- Tue Oct 14 16:15:09 CEST 2008 - jkupec@suse.cz diff --git a/libzypp.spec b/libzypp.spec index 1d5cee7..cc7306c 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 5.16.1) +# spec file for package libzypp (Version 5.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,20 +24,19 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 5.16.1 -Release: 10000 -Source: libzypp-5.16.1.tar.bz2 +Version: 5.17.0 +Release: 1 +Source: libzypp-5.17.0.tar.bz2 Source1: libzypp-rpmlintrc -Patch0: libzypp-bnc-409927.patch -Patch1: libzypp-r11473.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager +Recommends: logrotate BuildRequires: cmake -BuildRequires: libsatsolver-devel >= 0.11.0 openssl-devel +BuildRequires: libsatsolver-devel >= 0.12.0 openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel %if 0%{?suse_version} -BuildRequires: hicolor-icon-theme update-desktop-files +BuildRequires: hicolor-icon-theme rpm-devel update-desktop-files Requires: uuid-runtime %endif %if 0%{?fedora_version} @@ -51,11 +50,10 @@ Requires: e2fsprogs %endif %if 0%{?suse_version} Requires: gpg2 -Recommends: logrotate %else Requires: gnupg %endif -%requires_eq satsolver-tools +%requires_eq satsolver-tools %description Package, Patch, Pattern, and Product Management @@ -73,7 +71,7 @@ Authors: %package devel License: GPL v2 or later -Requires: libzypp == 5.16.1 +Requires: libzypp == 5.17.0 Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.10.14 @@ -98,8 +96,6 @@ Authors: %prep %setup -q -%patch0 -p1 -%patch1 -p0 %build mkdir build @@ -137,7 +133,7 @@ cd .. %{find_lang} zypp %post -/sbin/ldconfig +%run_ldconfig if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi #%{prefix}/lib/zypp/zypp-migrate-sources # convert old lock file to new @@ -195,7 +191,7 @@ if is_old ${LOCKSFILE} fi %postun -/sbin/ldconfig +%run_ldconfig %clean rm -rf "$RPM_BUILD_ROOT" @@ -206,6 +202,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /etc/zypp/repos.d %config(noreplace) /etc/zypp/zypp.conf %config(noreplace) /etc/zypp/systemCheck +%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr %dir %{_var}/lib/zypp %dir %{_var}/log/zypp %dir %{_var}/cache/zypp @@ -221,7 +218,6 @@ rm -rf "$RPM_BUILD_ROOT" %{prefix}/bin/package-manager-su %{_libdir}/libzypp*so.* %doc %_mandir/man5/locks.5.* -%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr %files devel %defattr(-,root,root) @@ -232,15 +228,43 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/pkgconfig/libzypp.pc %changelog -* Fri Oct 24 2008 coolo@suse.de -- hotfix against broken boost includes -* Mon Oct 20 2008 mrueckert@suse.de -- fix rpmlint warnings -- use requires_eq -- dont use deprecated macros +* Fri Oct 24 2008 schubi@suse.de +- Taking "unlock" instead of setTransact(false) in the solutions (bnc #436923) +- revision 11468 +- version 5.17.0 (17) +* Wed Oct 22 2008 ma@suse.de +- For retrieving a product license fall back to license.tar.gz. (bnc #372386) +- revision 11447 +* Wed Oct 22 2008 dmacvicar@suse.de +- move anonymous unique id to a private http header + X-ZYpp-AnonymousUniqueId (bnc#431571 ) +* Wed Oct 22 2008 ma@suse.de +- Adapt to satsolver-0.12 API. +- Add Locale:: bestMatch to find the best match within a set of + available Locales. +- revision 11441 +* Mon Oct 20 2008 ma@suse.de +- RepoInfo: Add methods to handle repository licenses. (bnc #372386) +- revision 11419 +* Mon Oct 20 2008 ma@suse.de +- Adapt to changed satsolver dataiterator API. +- revision 11418 +* Fri Oct 17 2008 ma@suse.de +- Secure download of license file on repo refresh (bnc #372386) +- revision 11398 +* Fri Oct 17 2008 ma@suse.de +- Call 'repo2solv.sh -o' instead of using output redirection. (bnc #420046) +- revision 11397 +* Thu Oct 16 2008 jkupec@suse.cz +- repository license methods added to RepoManager (bnc #372386) +- revision 11377 * Thu Oct 16 2008 dmacvicar@suse.de - don't take into account stat information when looking for remote SHA1SUMS (part of bnc#409927) +* Wed Oct 15 2008 jkupec@suse.cz +- MediaSetAccess::provideOptionalFile() added +- revision 11369 +- version 5.16.1 (16) * Tue Oct 14 2008 jkupec@suse.cz - don't initialize servicesTargetDistro via global ZYpp instance in RepoManagerOptions() constructor (bnc #435184)