Accepting request 19128 from zypp:Head

Copy from zypp:Head/libzypp based on submit request 19128 from user mlandres

OBS-URL: https://build.opensuse.org/request/show/19128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=179
This commit is contained in:
OBS User autobuild 2009-08-28 18:24:17 +00:00 committed by Git OBS Bridge
parent 4872e08975
commit ac7b1f8e4f
4 changed files with 59 additions and 37 deletions

View File

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

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

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

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Wed Aug 26 15:55:22 CEST 2009 - ma@suse.de
- Tune CheckAccessDeleted to focus on libraries and executables.
- version 6.13.2 (11)
-------------------------------------------------------------------
Thu Aug 6 18:18:21 CEST 2009 - ma@suse.de
- Provide class CheckAccessDeleted and command zypp-CheckAccessDeleted
to check for running processes which access meanwhile deleted files or
libraries. This may be used after commit, when trying to figure out
which services need to be restated. (fate #300763).
- version 6.13.1 (11)
-------------------------------------------------------------------
Mon Aug 3 18:46:13 CEST 2009 - ma@suse.de
- New Resolver::addUpgradeRepo to perform a dist upgrade restricted to
certain repositories.
- version 6.13.0 (11)
-------------------------------------------------------------------
Fri Jul 31 17:55:33 CEST 2009 - ma@suse.de
- Remove confusing newlines in vendor change info (bnc #503859)
- Removing a package lock was not counted as state change (bnc #501850)
- Take solver_allowVendorChange option into account when computing the
Selectables default candidate.
- version 6.12.0 (11)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 29 13:36:19 CEST 2009 - ma@suse.de Wed Jul 29 13:36:19 CEST 2009 - ma@suse.de

View File

@ -1,23 +1,31 @@
# #
# spec file for package libzypp # spec file for package libzypp (Version 6.13.2)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 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/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild # norootforbuild
Name: libzypp Name: libzypp
License: GPL v2 or later License: GPL v2 or later
Group: System/Packages 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: 6.11.4 Version: 6.13.2
Release: 0 Release: 1
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Prefix: /usr Prefix: /usr
@ -25,43 +33,36 @@ Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager Obsoletes: yast2-packagemanager
Recommends: logrotate Recommends: logrotate
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libsatsolver-devel >= 0.14.4 BuildRequires: libsatsolver-devel >= 0.14.5
BuildRequires: openssl-devel BuildRequires: 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
# required for testsuite, webrick # required for testsuite, webrick
BuildRequires: ruby BuildRequires: ruby
BuildRequires: aria2 >= 1.1.2 BuildRequires: aria2 >= 1.1.2
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
%else %else
BuildRequires: expat-devel BuildRequires: expat-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: hicolor-icon-theme update-desktop-files rpm-devel 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}
BuildRequires: glib2-devel popt-devel dbus-glib-devel rpm-devel BuildRequires: dbus-glib-devel glib2-devel popt-devel rpm-devel
%endif %endif
%if 0%{?mandriva_version} %if 0%{?mandriva_version}
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: librpm-devel BuildRequires: librpm-devel
# uuidgen # uuidgen
Requires: e2fsprogs Requires: e2fsprogs
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: gpg2 Requires: gpg2
%else %else
Requires: gnupg Requires: gnupg
%endif %endif
%requires_eq satsolver-tools %requires_eq satsolver-tools
Requires: aria2 >= 1.1.2 Requires: aria2 >= 1.1.2
%description %description
@ -79,6 +80,7 @@ Authors:
Ladislav Slezak <lslezak@suse.cz> Ladislav Slezak <lslezak@suse.cz>
%package devel %package devel
License: GPL v2 or later
Requires: libzypp == %{version} Requires: libzypp == %{version}
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
@ -119,14 +121,12 @@ cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
make %{?jobs:-j %jobs} VERBOSE=1 make %{?jobs:-j %jobs} VERBOSE=1
make -C doc/autodoc %{?jobs:-j %jobs} make -C doc/autodoc %{?jobs:-j %jobs}
make -C po %{?jobs:-j %jobs} translations make -C po %{?jobs:-j %jobs} translations
%if 0%{?run_testsuite} %if 0%{?run_testsuite}
make -C tests %{?jobs:-j %jobs} make -C tests %{?jobs:-j %jobs}
pushd tests pushd tests
LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest . LD_LIBRARY_PATH=$PWD/../zypp:$LD_LIBRARY_PATH ctest .
popd popd
%endif %endif
#make check #make check
%install %install
@ -136,31 +136,26 @@ make install DESTDIR=$RPM_BUILD_ROOT
make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d
mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d
mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp
mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/zypp
mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/log/zypp
mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/zypp
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file -G "" -C "" package-manager %suse_update_desktop_file -G "" -C "" package-manager
%endif %endif
make -C po install DESTDIR=$RPM_BUILD_ROOT make -C po install DESTDIR=$RPM_BUILD_ROOT
# Create filelist with translations # Create filelist with translations
cd .. cd ..
%{find_lang} zypp %{find_lang} zypp
%post %post
%run_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
# convert old lock file to new # convert old lock file to new
# TODO make this a separate file? # TODO make this a separate file?
# TODO run the sript only when updating form pre-11.0 libzypp versions # TODO run the sript only when updating form pre-11.0 libzypp versions
LOCKSFILE=/etc/zypp/locks LOCKSFILE=/etc/zypp/locks
OLDLOCKSFILE=/etc/zypp/locks.old OLDLOCKSFILE=/etc/zypp/locks.old
is_old(){ is_old(){
# if no such file, exit with false (1 in bash) # if no such file, exit with false (1 in bash)
test -f ${LOCKSFILE} || return 1 test -f ${LOCKSFILE} || return 1
@ -175,7 +170,6 @@ is_old(){
rm -f ${TEMP_FILE} rm -f ${TEMP_FILE}
return ${RES} return ${RES}
} }
append_new_lock(){ append_new_lock(){
case "$#" in case "$#" in
1 ) 1 )
@ -200,12 +194,10 @@ version: $2 $3
;; ;;
esac esac
} }
die() { die() {
echo $1 echo $1
exit 1 exit 1
} }
if is_old ${LOCKSFILE} if is_old ${LOCKSFILE}
then then
mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks" mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks"
@ -215,7 +207,6 @@ if is_old ${LOCKSFILE}
done done
fi fi
%postun %postun
%run_ldconfig %run_ldconfig
@ -233,6 +224,7 @@ rm -rf "$RPM_BUILD_ROOT"
%dir %{_var}/lib/zypp %dir %{_var}/lib/zypp
%dir %{_var}/log/zypp %dir %{_var}/log/zypp
%dir %{_var}/cache/zypp %dir %{_var}/cache/zypp
%dir %{prefix}/lib/zypp
%{prefix}/share/zypp %{prefix}/share/zypp
%{prefix}/share/applications/package-manager.desktop %{prefix}/share/applications/package-manager.desktop
%{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg %{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg
@ -241,8 +233,7 @@ rm -rf "$RPM_BUILD_ROOT"
%{prefix}/share/icons/hicolor/24x24/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/24x24/apps/package-manager-icon.png
%{prefix}/share/icons/hicolor/32x32/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/32x32/apps/package-manager-icon.png
%{prefix}/share/icons/hicolor/48x48/apps/package-manager-icon.png %{prefix}/share/icons/hicolor/48x48/apps/package-manager-icon.png
%{prefix}/bin/package-manager %{prefix}/bin/*
%{prefix}/bin/package-manager-su
%{_libdir}/libzypp*so.* %{_libdir}/libzypp*so.*
%doc %_mandir/man5/locks.5.* %doc %_mandir/man5/locks.5.*