Accepting request 33567 from zypp:Head
Copy from zypp:Head/libzypp based on submit request 33567 from user mlandres OBS-URL: https://build.opensuse.org/request/show/33567 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=197
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
e2c9cc117a
commit
ec9e005004
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4ff9629172812f5f31f8e7c0961a9cf9f1662cf19f5b9ebe6ac44b296781c0c5
|
||||
size 4764206
|
||||
3
libzypp-6.30.4.tar.bz2
Normal file
3
libzypp-6.30.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:faffbc11a88fef3ff57d76cd22381583ebe115f39a0f9e0e446a01d876898461
|
||||
size 4948943
|
||||
@ -1,3 +1,56 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 23 19:05:04 CET 2010 - jkupec@suse.cz
|
||||
|
||||
- Avoiding use of 'guest' if 'credentials' is used when moutning
|
||||
a CIFS share. This caused 'permission denied' error with certain
|
||||
server configurations (bnc #560496).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 23 17:31:05 CET 2010 - ma@suse.de
|
||||
|
||||
- Check if a downloaded file actually exists even if aria2c returned 0.
|
||||
(bnc #564816)
|
||||
- version 6.30.3 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 22 15:25:34 CET 2010 - jkupec@suse.cz
|
||||
|
||||
- Made CURLE_PARTIAL_FILE an auto-retry error (bnc #471436)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 22 13:09:09 CET 2010 - ma@suse.de
|
||||
|
||||
- Turn off cookies when retrieving services repoindex.xml (bnc #573897)
|
||||
- Consider pending disable requests when removing service repositories. (bnc #572634)
|
||||
- version 6.30.1 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 21 14:11:49 CET 2010 - jkupec@suse.cz
|
||||
|
||||
- RepoManager::cleanCacheDirGarbage added for removing directories
|
||||
which do not belong to any of known repos (bnc #467693)
|
||||
- version 6.30.0 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 11 13:40:49 CET 2010 - ma@suse.de
|
||||
|
||||
- On SLE aria2 is not required, so conflict with a too old aria2
|
||||
version installed. (bnc #578052)
|
||||
- version 6.29.5 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 10 12:45:21 CET 2010 - ma@suse.de
|
||||
|
||||
- Fix package-manager script wrongly escaping UTF-8 chars in path
|
||||
names (bnc #571410)
|
||||
- version 6.29.4 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 8 13:21:40 CET 2010 - ma@suse.de
|
||||
|
||||
- Support an alternate SLE-SP1 translation set.
|
||||
- version 6.29.3 (19)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 15:57:13 CET 2010 - ma@suse.de
|
||||
|
||||
|
||||
56
libzypp.spec
56
libzypp.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package libzypp (Version 6.29.2)
|
||||
# spec file for package libzypp (Version 6.30.4)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -24,50 +24,70 @@ Group: System/Packages
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
AutoReqProv: on
|
||||
Summary: Package, Patch, Pattern, and Product Management
|
||||
Version: 6.29.2
|
||||
Version: 6.30.4
|
||||
Release: 1
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-rpmlintrc
|
||||
Prefix: /usr
|
||||
Provides: yast2-packagemanager
|
||||
Obsoletes: yast2-packagemanager
|
||||
%if 0%{?suse_version}
|
||||
Recommends: logrotate
|
||||
%endif
|
||||
BuildRequires: cmake
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel
|
||||
|
||||
BuildRequires: libsatsolver-devel >= 0.14.13
|
||||
%if 0%{?suse_version}
|
||||
%requires_eq satsolver-tools
|
||||
%else
|
||||
Requires: satsolver-tools
|
||||
%endif
|
||||
|
||||
# required for testsuite, webrick
|
||||
BuildRequires: ruby
|
||||
|
||||
%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
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora_version}
|
||||
BuildRequires: dbus-glib-devel glib2-devel popt-devel rpm-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?mandriva_version}
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: librpm-devel
|
||||
# uuidgen
|
||||
Requires: e2fsprogs
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
Requires: gpg2
|
||||
%else
|
||||
Requires: gnupg
|
||||
Requires: gnupg2
|
||||
%endif
|
||||
|
||||
%define min_aria_version 1.1.2
|
||||
# ---------------------------------------------------------------
|
||||
%if 0%{?suse_version} == 1110
|
||||
# (almost) common codebase, but on SLES11-SP1 (according to Rudi
|
||||
# suse_version == 1110) we have a patched libcurl-7.19.0-11.22,
|
||||
# and no aria2.
|
||||
# and no aria2. Furthermore SLE may use it's own set of .po files
|
||||
# from po/sle-zypp-po.tar.bz2.
|
||||
%define min_curl_version 7.19.0-11.22
|
||||
%define use_translation_set sle-zypp
|
||||
# No requirement, but as we'd use it in case it is present,
|
||||
# check for a sufficient version:
|
||||
Conflicts: aria2 < %{min_aria_version}
|
||||
# ---------------------------------------------------------------
|
||||
%else
|
||||
# ---------------------------------------------------------------
|
||||
@ -75,11 +95,16 @@ Requires: gnupg
|
||||
# need CURLOPT_REDIR_PROTOCOLS:
|
||||
%define min_curl_version 7.19.4
|
||||
# want aria2:
|
||||
Requires: aria2 >= 1.1.2
|
||||
BuildRequires: aria2 >= 1.1.2
|
||||
Requires: aria2 >= %{min_aria_version}
|
||||
BuildRequires: aria2 >= %{min_aria_version}
|
||||
%endif
|
||||
# ---------------------------------------------------------------
|
||||
|
||||
%if 0%{?suse_version}
|
||||
Requires: libcurl4 >= %{min_curl_version}
|
||||
%else
|
||||
Requires: libcurl >= %{min_curl_version}
|
||||
%endif
|
||||
BuildRequires: libcurl-devel >= %{min_curl_version}
|
||||
|
||||
%description
|
||||
@ -103,7 +128,11 @@ Requires: libxml2-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
|
||||
Requires: libcurl-devel >= %{min_curl_version}
|
||||
%if 0%{?suse_version}
|
||||
%requires_ge libsatsolver-devel
|
||||
%else
|
||||
Requires: libsatsolver-devel
|
||||
%endif
|
||||
Summary: Package, Patch, Pattern, and Product Management - developers files
|
||||
Group: System/Packages
|
||||
Provides: yast2-packagemanager-devel
|
||||
@ -136,16 +165,19 @@ cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
|
||||
-DLIB=%{_lib} \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SKIP_RPATH=1 \
|
||||
%{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \
|
||||
..
|
||||
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
|
||||
@ -159,22 +191,26 @@ mkdir -p $RPM_BUILD_ROOT/%{_usr}/lib/zypp
|
||||
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
|
||||
/sbin/ldconfig
|
||||
if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
|
||||
|
||||
# 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
|
||||
@ -189,6 +225,7 @@ is_old(){
|
||||
rm -f ${TEMP_FILE}
|
||||
return ${RES}
|
||||
}
|
||||
|
||||
append_new_lock(){
|
||||
case "$#" in
|
||||
1 )
|
||||
@ -213,10 +250,12 @@ version: $2 $3
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
die() {
|
||||
echo $1
|
||||
exit 1
|
||||
}
|
||||
|
||||
if is_old ${LOCKSFILE}
|
||||
then
|
||||
mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks"
|
||||
@ -226,8 +265,7 @@ if is_old ${LOCKSFILE}
|
||||
done
|
||||
fi
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user