From 92191826ef79510121eaf70e5805ff5602d2411c846f915e63f44d6a90c192c9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 24 Oct 2008 11:20:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=151 --- libzypp-r11473.diff | 30 ++++++++++++++++++++++++++++++ libzypp.changes | 5 +++++ libzypp.spec | 6 +++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 libzypp-r11473.diff diff --git a/libzypp-r11473.diff b/libzypp-r11473.diff new file mode 100644 index 0000000..f98fc6f --- /dev/null +++ b/libzypp-r11473.diff @@ -0,0 +1,30 @@ +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 71ca1af..9ad8a9a 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 24 12:39:06 CEST 2008 - coolo@suse.de + +- hotfix against broken boost includes + ------------------------------------------------------------------- Mon Oct 20 21:01:52 CEST 2008 - mrueckert@suse.de diff --git a/libzypp.spec b/libzypp.spec index 678e132..1d5cee7 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -25,10 +25,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management Version: 5.16.1 -Release: 3 +Release: 10000 Source: libzypp-5.16.1.tar.bz2 Source1: libzypp-rpmlintrc Patch0: libzypp-bnc-409927.patch +Patch1: libzypp-r11473.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -98,6 +99,7 @@ Authors: %prep %setup -q %patch0 -p1 +%patch1 -p0 %build mkdir build @@ -230,6 +232,8 @@ 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