From 4872e08975b45b207913176c3fa51ca886494050cfd4c71ca5791ea3001f2348 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 30 Jul 2009 14:36:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=178 --- libzypp-6.10.5.tar.bz2 | 3 --- libzypp-6.11.4.tar.bz2 | 3 +++ libzypp.changes | 39 +++++++++++++++++++++++++++++++ libzypp.spec | 53 ++++++++++++++++++++++++------------------ 4 files changed, 73 insertions(+), 25 deletions(-) delete mode 100644 libzypp-6.10.5.tar.bz2 create mode 100644 libzypp-6.11.4.tar.bz2 diff --git a/libzypp-6.10.5.tar.bz2 b/libzypp-6.10.5.tar.bz2 deleted file mode 100644 index dfcc2be..0000000 --- a/libzypp-6.10.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:304e15343b94905b57259cd6b8b3245e8fc4275e022af2c7e4681e82003aa71d -size 4660223 diff --git a/libzypp-6.11.4.tar.bz2 b/libzypp-6.11.4.tar.bz2 new file mode 100644 index 0000000..dddb81a --- /dev/null +++ b/libzypp-6.11.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c98e16b262b0d438b39a1ba64e0f6b4c25d9079debebb1ebbd5805bc3fbde3c +size 4655999 diff --git a/libzypp.changes b/libzypp.changes index 2ae5fee..d111458 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Wed Jul 29 13:36:19 CEST 2009 - ma@suse.de + +- Avoid deadlock after fork and failed exec. (bnc 493152) +- No need to manually detect the location of aria2 binary. +- version 6.11.4 (11) + +------------------------------------------------------------------- +Tue Jul 28 23:05:43 CEST 2009 - jkupec@suse.cz + +- Fixed parsing of download rate report (changed in aria2 1.4.0) + (bnc #513944) + +------------------------------------------------------------------- +Mon Jul 27 16:05:43 CEST 2009 - ma@suse.de + +- Create LogControl on demand instead of using a static var. (bnc #525339) +- version 6.11.2 (11) + +------------------------------------------------------------------- +Thu Jul 23 00:22:50 CEST 2009 - ma@km13.de + +- New misc::defaultLoadSystem: Convenience to create the ZYpp instance + and load target and enabled repositories. + +------------------------------------------------------------------- +Wed Jul 22 14:57:32 CEST 2009 - ma@suse.de + +- New class InstanceId to build strings to identify/retrieve specific + Solvables. +- version 6.11.1 (11) + +------------------------------------------------------------------- +Mon Jul 20 23:57:46 CEST 2009 - ma@km13.de + +- Add download policies to ZYppCommitPolicy, supporting DownloadOnly + and DownloadInAdvance. (fate #302159, fate #305624) +- version 6.11.0 (11) + ------------------------------------------------------------------- Thu Jul 16 17:05:27 CEST 2009 - dmacvicar@suse.de diff --git a/libzypp.spec b/libzypp.spec index 7e979bd..0abccb5 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -1,31 +1,23 @@ # -# spec file for package libzypp (Version 6.10.5) +# spec file for package libzypp # -# Copyright (c) 2009 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: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on +Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management -Version: 6.10.5 -Release: 1 +Version: 6.11.4 +Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Prefix: /usr @@ -33,36 +25,43 @@ Provides: yast2-packagemanager Obsoletes: yast2-packagemanager Recommends: logrotate BuildRequires: cmake -BuildRequires: libsatsolver-devel >= 0.14.2 +BuildRequires: libsatsolver-devel >= 0.14.4 BuildRequires: openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel + # required for testsuite, webrick BuildRequires: ruby -BuildRequires: aria2 >= 1.1.2 +BuildRequires: aria2 >= 1.1.2 + %if 0%{?suse_version} BuildRequires: libexpat-devel %else BuildRequires: expat-devel %endif + %if 0%{?suse_version} -BuildRequires: hicolor-icon-theme rpm-devel update-desktop-files -Requires: uuid-runtime +BuildRequires: hicolor-icon-theme update-desktop-files rpm-devel +Requires: uuid-runtime %endif + %if 0%{?fedora_version} -BuildRequires: dbus-glib-devel glib2-devel popt-devel rpm-devel +BuildRequires: glib2-devel popt-devel dbus-glib-devel rpm-devel %endif + %if 0%{?mandriva_version} BuildRequires: glib2-devel BuildRequires: librpm-devel # uuidgen -Requires: e2fsprogs +Requires: e2fsprogs %endif + %if 0%{?suse_version} Requires: gpg2 %else Requires: gnupg %endif %requires_eq satsolver-tools + Requires: aria2 >= 1.1.2 %description @@ -80,7 +79,6 @@ Authors: Ladislav Slezak %package devel -License: GPL v2 or later Requires: libzypp == %{version} 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 @@ -121,12 +119,14 @@ cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ make %{?jobs:-j %jobs} VERBOSE=1 make -C doc/autodoc %{?jobs:-j %jobs} make -C po %{?jobs:-j %jobs} translations + %if 0%{?run_testsuite} make -C tests %{?jobs:-j %jobs} pushd tests LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest . popd %endif + #make check %install @@ -139,23 +139,28 @@ mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp + %if 0%{?suse_version} %suse_update_desktop_file -G "" -C "" package-manager %endif + make -C po install DESTDIR=$RPM_BUILD_ROOT # Create filelist with translations cd .. %{find_lang} zypp + %post %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 # TODO make this a separate file? # TODO run the sript only when updating form pre-11.0 libzypp versions LOCKSFILE=/etc/zypp/locks OLDLOCKSFILE=/etc/zypp/locks.old + is_old(){ # if no such file, exit with false (1 in bash) test -f ${LOCKSFILE} || return 1 @@ -170,6 +175,7 @@ is_old(){ rm -f ${TEMP_FILE} return ${RES} } + append_new_lock(){ case "$#" in 1 ) @@ -194,10 +200,12 @@ version: $2 $3 ;; esac } + die() { echo $1 exit 1 } + if is_old ${LOCKSFILE} then mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks" @@ -207,6 +215,7 @@ if is_old ${LOCKSFILE} done fi + %postun %run_ldconfig