Accepting request 75338 from zypp:Head

update

OBS-URL: https://build.opensuse.org/request/show/75338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=242
This commit is contained in:
Sascha Peilicke 2011-07-05 08:14:28 +00:00 committed by Git OBS Bridge
commit 9a2cb6bd19
4 changed files with 27 additions and 20 deletions

View File

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

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

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jul 4 10:41:42 CEST 2011 - ma@suse.de
- Make fix for bnc#702576 more robust.
- Enhance fix for bnc#699435. Return an error if download in advance
failed to provide all packages, so zypper does not silently quit.
- version 9.8.3 (8)
-------------------------------------------------------------------
Thu Jun 30 01:13:43 CEST 2011 - ma@suse.de
- Update zypp-po.tar.bz2
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 29 12:23:24 CEST 2011 - ma@suse.de Wed Jun 29 12:23:24 CEST 2011 - ma@suse.de

View File

@ -1,36 +1,29 @@
# #
# spec file for package libzypp # spec file for package libzypp
# #
# Copyright (c) 2011 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/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild # norootforbuild
Name: libzypp Name: libzypp
License: GPLv2 License: GPLv2
Group: System/Packages Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management Summary: Package, Patch, Pattern, and Product Management
Version: 9.8.2 Version: 9.8.3
Release: 1 Release: 0
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Provides: yast2-packagemanager Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager Obsoletes: yast2-packagemanager
# Features we provide (update doc/autoinclude/FeatureTest.doc): # Features we provide (update doc/autoinclude/FeatureTest.doc):
Provides: libzypp(plugin) = 0
Provides: libzypp(plugin:commit) = 0 Provides: libzypp(plugin:commit) = 0
Provides: libzypp(plugin:services) = 0 Provides: libzypp(plugin:services) = 0
Provides: libzypp(plugin:system) = 0 Provides: libzypp(plugin:system) = 0
@ -145,7 +138,6 @@ Authors:
Ladislav Slezak <lslezak@suse.cz> Ladislav Slezak <lslezak@suse.cz>
%package devel %package devel
Requires: libzypp = %{version} Requires: libzypp = %{version}
Requires: libxml2-devel Requires: libxml2-devel
Requires: openssl-devel Requires: openssl-devel
@ -165,14 +157,14 @@ Requires: cmake
%if 0%{?suse_version} %if 0%{?suse_version}
%if 0%{?suse_version} >= 1100 %if 0%{?suse_version} >= 1100
# Code11+ # Code11+
Requires: libcurl-devel >= %{min_curl_version} Requires: libcurl-devel >= %{min_curl_version}
%else %else
# Code10 # Code10
Requires: curl-devel Requires: curl-devel
%endif %endif
%else %else
# Other distros (Fedora) # Other distros (Fedora)
Requires: libcurl-devel >= %{min_curl_version} Requires: libcurl-devel >= %{min_curl_version}
%endif %endif
%if 0%{?suse_version} >= 1100 %if 0%{?suse_version} >= 1100
%requires_ge libsatsolver-devel %requires_ge libsatsolver-devel
@ -259,6 +251,7 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT
cd .. cd ..
%{find_lang} zypp %{find_lang} zypp
%post %post
/sbin/ldconfig /sbin/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
@ -323,6 +316,7 @@ if is_old ${LOCKSFILE}
done done
fi fi
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%clean %clean