From fc021aac5d26239f6fc697b4e83506ea40ff38b2ee0d199d6e9f4f8e74144e2e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 25 Sep 2008 11:18:59 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=142

---
 libzypp-5.12.0.tar.bz2 |  3 ---
 libzypp-5.12.1.tar.bz2 |  3 +++
 libzypp.changes        |  2 +-
 libzypp.spec           | 31 +++++++++++++------------------
 4 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 libzypp-5.12.0.tar.bz2
 create mode 100644 libzypp-5.12.1.tar.bz2

diff --git a/libzypp-5.12.0.tar.bz2 b/libzypp-5.12.0.tar.bz2
deleted file mode 100644
index ec20f8c..0000000
--- a/libzypp-5.12.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b312f3a3df038d32078220f0001e68a3b26571b05680baf6b7bd823b4510fea3
-size 9634787
diff --git a/libzypp-5.12.1.tar.bz2 b/libzypp-5.12.1.tar.bz2
new file mode 100644
index 0000000..3756ff4
--- /dev/null
+++ b/libzypp-5.12.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e17950c560c7f8401a1b7ad49c3cb3968860ae3cc4daa3cc088b1215616b40c
+size 9746210
diff --git a/libzypp.changes b/libzypp.changes
index 7585592..5caba57 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -6,7 +6,7 @@ Wed Sep 24 19:11:19 CEST 2008 - jkupec@suse.cz
   history.logfile (/var/log/zypp/history) (fate #110205)
 - str::escape(string, char) added
 - revision 11150
-- version 5.12.0 (12)
+- version 5.12.1 (12)
 
 -------------------------------------------------------------------
 Tue Sep 23 14:02:08 CEST 2008 - jkupec@suse.cz
diff --git a/libzypp.spec b/libzypp.spec
index e8431bf..e04a8ef 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libzypp (Version 5.12.0)
+# spec file for package libzypp (Version 5.12.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,9 +24,9 @@ Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
 Summary:        Package, Patch, Pattern, and Product Management
-Version:        5.12.0
+Version:        5.12.1
 Release:        1
-Source:         libzypp-5.12.0.tar.bz2
+Source:         libzypp-5.12.1.tar.bz2
 Source1:        libzypp-rpmlintrc
 Prefix:         /usr
 Provides:       yast2-packagemanager
@@ -70,7 +70,7 @@ Authors:
 
 %package devel
 License:        GPL v2 or later
-Requires:       libzypp == 5.12.0
+Requires:       libzypp == 5.12.1
 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:       cmake libsatsolver-devel >= 0.10.14
@@ -121,8 +121,9 @@ 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/products.d
 mkdir -p $RPM_BUILD_ROOT/etc/zypp/services.d
-mkdir -p $RPM_BUILD_ROOT/var/lib/zypp
-mkdir -p $RPM_BUILD_ROOT/var/cache/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
@@ -199,11 +200,11 @@ rm -rf "$RPM_BUILD_ROOT"
 %defattr(-,root,root)
 %dir               /etc/zypp
 %dir               /etc/zypp/repos.d
-%dir               /etc/zypp/products.d
 %config(noreplace) /etc/zypp/zypp.conf
 %config(noreplace) /etc/zypp/systemCheck
-%dir               /var/lib/zypp
-%dir               /var/cache/zypp
+%dir               %{_var}/lib/zypp
+%dir               %{_var}/log/zypp
+%dir               %{_var}/cache/zypp
 %{prefix}/lib/zypp
 %{prefix}/share/zypp
 %{prefix}/share/applications/package-manager.desktop
@@ -217,21 +218,15 @@ rm -rf "$RPM_BUILD_ROOT"
 %{prefix}/bin/package-manager-su
 %{_libdir}/libzypp*so.*
 %doc %_mandir/man5/locks.5.*
+%{_sysconfdir}/logrotate.d/zypp-history.lr
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libzypp.so
-#%dir %{_libdir}/libzypp.la
 %{_docdir}/%{name}
-%dir %{prefix}/include/zypp
-%{prefix}/include/zypp/*
+%{prefix}/include/zypp
 %{prefix}/share/cmake/Modules/*
 %{_libdir}/pkgconfig/libzypp.pc
-%dir %{_var}/log/zypp
-# declare ownership of the log file but prevent
-# it from being erased by rpm -e
-%ghost %config(noreplace) %{_var}/log/zypp/history
-%{_sysconfdir}/logrotate.d/zypp-history.lr
 
 %changelog
 * Wed Sep 24 2008 jkupec@suse.cz
@@ -240,7 +235,7 @@ rm -rf "$RPM_BUILD_ROOT"
   history.logfile (/var/log/zypp/history) (fate #110205)
 - str::escape(string, char) added
 - revision 11150
-- version 5.12.0 (12)
+- version 5.12.1 (12)
 * Tue Sep 23 2008 jkupec@suse.cz
 - CredentialManager: look for credentials with
   wanted_url.startsWith(stored_url)