pool/libzypp
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=152

Browse Source
This commit is contained in:
OBS User unknown 2008-10-24 13:19:57 +00:00 committed by Git OBS Bridge
parent 92191826ef
commit f5478dfe59
6 changed files with 110 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libzypp-5.16.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4e03cf5976dab51fda1c4aecafc6daabf2ca15f0c2ed0659fe6dc897fd5b816
size 3534948

3
libzypp-5.17.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52230937e78ddb8b1e913e1dd001d4604204d3b79fc88f8b16f65cc84832311c
size 4620296

33
libzypp-bnc-409927.patch
View File

@ -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. */

30
libzypp-r11473.diff
View File

@ -1,30 +0,0 @@
Index: zypp/PathInfo.cc
===================================================================
--- zypp/PathInfo.cc (Revision 11472)
+++ zypp/PathInfo.cc (Revision 11473)
@@ -18,9 +18,6 @@
#include <fstream>
#include <iomanip>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
-
#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,

67
libzypp.changes
View File

@ -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 - For retrieving a product license fall back to license.tar.gz. (bnc #372386)
- use requires_eq - revision 11447
- dont use deprecated macros
-------------------------------------------------------------------
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 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 - don't take into account stat information when looking
for remote SHA1SUMS (part of bnc#409927) 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 Tue Oct 14 16:15:09 CEST 2008 - jkupec@suse.cz

68
libzypp.spec
View File

@ -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. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -24,20 +24,19 @@ Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management Summary: Package, Patch, Pattern, and Product Management
Version: 5.16.1 Version: 5.17.0
Release: 10000 Release: 1
Source: libzypp-5.16.1.tar.bz2 Source: libzypp-5.17.0.tar.bz2
Source1: libzypp-rpmlintrc Source1: libzypp-rpmlintrc
Patch0: libzypp-bnc-409927.patch
Patch1: libzypp-r11473.diff
Prefix: /usr Prefix: /usr
Provides: yast2-packagemanager Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager Obsoletes: yast2-packagemanager
Recommends: logrotate
BuildRequires: cmake 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 BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: hicolor-icon-theme update-desktop-files BuildRequires: hicolor-icon-theme rpm-devel update-desktop-files
Requires: uuid-runtime Requires: uuid-runtime
%endif %endif
%if 0%{?fedora_version} %if 0%{?fedora_version}
@ -51,11 +50,10 @@ Requires: e2fsprogs
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: gpg2 Requires: gpg2
Recommends: logrotate
%else %else
Requires: gnupg Requires: gnupg
%endif %endif
%requires_eq satsolver-tools %requires_eq satsolver-tools
%description %description
Package, Patch, Pattern, and Product Management Package, Patch, Pattern, and Product Management
@ -73,7 +71,7 @@ Authors:
%package devel %package devel
License: GPL v2 or later 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: 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: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
Requires: cmake libsatsolver-devel >= 0.10.14 Requires: cmake libsatsolver-devel >= 0.10.14
@ -98,8 +96,6 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p0
%build %build
mkdir build mkdir build
@ -137,7 +133,7 @@ cd ..
%{find_lang} zypp %{find_lang} zypp
%post %post
/sbin/ldconfig %run_ldconfig
if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
#%{prefix}/lib/zypp/zypp-migrate-sources #%{prefix}/lib/zypp/zypp-migrate-sources
# convert old lock file to new # convert old lock file to new
@ -195,7 +191,7 @@ if is_old ${LOCKSFILE}
fi fi
%postun %postun
/sbin/ldconfig %run_ldconfig
%clean %clean
rm -rf "$RPM_BUILD_ROOT" rm -rf "$RPM_BUILD_ROOT"
@ -206,6 +202,7 @@ rm -rf "$RPM_BUILD_ROOT"
%dir /etc/zypp/repos.d %dir /etc/zypp/repos.d
%config(noreplace) /etc/zypp/zypp.conf %config(noreplace) /etc/zypp/zypp.conf
%config(noreplace) /etc/zypp/systemCheck %config(noreplace) /etc/zypp/systemCheck
%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
%dir %{_var}/lib/zypp %dir %{_var}/lib/zypp
%dir %{_var}/log/zypp %dir %{_var}/log/zypp
%dir %{_var}/cache/zypp %dir %{_var}/cache/zypp
@ -221,7 +218,6 @@ rm -rf "$RPM_BUILD_ROOT"
%{prefix}/bin/package-manager-su %{prefix}/bin/package-manager-su
%{_libdir}/libzypp*so.* %{_libdir}/libzypp*so.*
%doc %_mandir/man5/locks.5.* %doc %_mandir/man5/locks.5.*
%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -232,15 +228,43 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/pkgconfig/libzypp.pc %{_libdir}/pkgconfig/libzypp.pc
%changelog %changelog
* Fri Oct 24 2008 coolo@suse.de * Fri Oct 24 2008 schubi@suse.de
- hotfix against broken boost includes - Taking "unlock" instead of setTransact(false) in the solutions (bnc #436923)
* Mon Oct 20 2008 mrueckert@suse.de - revision 11468
- fix rpmlint warnings - version 5.17.0 (17)
- use requires_eq * Wed Oct 22 2008 ma@suse.de
- dont use deprecated macros - 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 * Thu Oct 16 2008 dmacvicar@suse.de
- don't take into account stat information when looking - don't take into account stat information when looking
for remote SHA1SUMS (part of bnc#409927) 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 * Tue Oct 14 2008 jkupec@suse.cz
- don't initialize servicesTargetDistro via global ZYpp instance in - don't initialize servicesTargetDistro via global ZYpp instance in
RepoManagerOptions() constructor (bnc #435184) RepoManagerOptions() constructor (bnc #435184)