From f48c8154ef432cc0d164d95ce347b009ab4977533d479c770cd15af6a62c9584 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 18 Oct 2011 16:26:16 +0000 Subject: [PATCH] Update to last sucessful build 40fd05238230487b416dcffbc678d291ea9a19a7 Fix RepoVariables_test OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=827 --- libzypp-10.1.1.tar.bz2 | 3 --- libzypp-10.2.0.tar.bz2 | 3 +++ libzypp.changes | 8 ++++++++ libzypp.spec | 31 +++++++++++++++++++------------ 4 files changed, 30 insertions(+), 15 deletions(-) delete mode 100644 libzypp-10.1.1.tar.bz2 create mode 100644 libzypp-10.2.0.tar.bz2 diff --git a/libzypp-10.1.1.tar.bz2 b/libzypp-10.1.1.tar.bz2 deleted file mode 100644 index 5e8c667..0000000 --- a/libzypp-10.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6e9971919a0e0a95dcf35ce7c01f8b38eb8ae5ce8e3d1155990141eb2c28e2f -size 5003767 diff --git a/libzypp-10.2.0.tar.bz2 b/libzypp-10.2.0.tar.bz2 new file mode 100644 index 0000000..2df1a88 --- /dev/null +++ b/libzypp-10.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a2f09b8055ce5cf3a1a0fc47e2baf26558ca126f7e566aedea437378eb5ac94 +size 5004577 diff --git a/libzypp.changes b/libzypp.changes index b01a727..e1721d0 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 18 16:45:13 CEST 2011 - ma@suse.de + +- Add arch armv7tnhl and armv7thl +- Fix RepoVariablesReplacer to compute substitution values on demand only +- PathInfo::hardlinkCopy: fix handling cross-device links +- version 10.2.0 (1) + ------------------------------------------------------------------- Sun Oct 16 01:13:37 CEST 2011 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index 3285026..54cccf4 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -1,22 +1,30 @@ # # spec file for package libzypp # -# 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. +# Copyright (c) 2005-2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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: GPLv2 +License: GPLv2+ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 10.1.1 -Release: 0 +Version: 10.2.0 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Provides: yast2-packagemanager @@ -66,7 +74,7 @@ BuildRequires: libexpat-devel BuildRequires: expat-devel %endif -Requires: rpm +Requires: rpm %if 0%{?suse_version} BuildRequires: rpm-devel @@ -139,6 +147,7 @@ Authors: Ladislav Slezak %package devel +License: GPLv2+ Requires: libzypp = %{version} Requires: libxml2-devel Requires: openssl-devel @@ -158,14 +167,14 @@ Requires: cmake %if 0%{?suse_version} %if 0%{?suse_version} >= 1100 # Code11+ -Requires: libcurl-devel >= %{min_curl_version} +Requires: libcurl-devel >= %{min_curl_version} %else # Code10 -Requires: curl-devel +Requires: curl-devel %endif %else # Other distros (Fedora) -Requires: libcurl-devel >= %{min_curl_version} +Requires: libcurl-devel >= %{min_curl_version} %endif %if 0%{?suse_version} >= 1100 %requires_ge libsolv-devel @@ -252,7 +261,6 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT cd .. %{find_lang} zypp - %post /sbin/ldconfig if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi @@ -317,7 +325,6 @@ if is_old ${LOCKSFILE} done fi - %postun -p /sbin/ldconfig %clean