From 197adffc30bfa3bf2aa70c2ecdff997d14b9a5b7ba9a991fb32b6f0d750616e8 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 22 Oct 2008 16:19:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=150

---
 libzypp.changes |  7 +++++++
 libzypp.spec    | 18 +++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/libzypp.changes b/libzypp.changes
index 2db3844..71ca1af 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 20 21:01:52 CEST 2008 - mrueckert@suse.de
+
+- fix rpmlint warnings
+- use requires_eq
+- dont use deprecated macros
+
 -------------------------------------------------------------------
 Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index ef5f412..678e132 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -25,7 +25,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
 Summary:        Package, Patch, Pattern, and Product Management
 Version:        5.16.1
-Release:        2
+Release:        3
 Source:         libzypp-5.16.1.tar.bz2
 Source1:        libzypp-rpmlintrc
 Patch0:         libzypp-bnc-409927.patch
@@ -36,7 +36,7 @@ BuildRequires:  cmake
 BuildRequires:  libsatsolver-devel >= 0.11.0 openssl-devel
 BuildRequires:  boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel
 %if 0%{?suse_version}
-BuildRequires:  hicolor-icon-theme rpm-devel update-desktop-files
+BuildRequires:  hicolor-icon-theme update-desktop-files
 Requires:       uuid-runtime
 %endif
 %if 0%{?fedora_version}
@@ -50,10 +50,11 @@ Requires:       e2fsprogs
 %endif
 %if 0%{?suse_version}
 Requires:       gpg2
+Recommends:     logrotate
 %else
 Requires:       gnupg
 %endif
-Requires:       satsolver-tools == %( echo `rpm -q --queryformat '%{VERSION}' satsolver-tools`)
+%requires_eq satsolver-tools
 
 %description
 Package, Patch, Pattern, and Product Management
@@ -75,7 +76,6 @@ Requires:       libzypp == 5.16.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
-Recommends:     logrotate
 Summary:        Package, Patch, Pattern, and Product Management - developers files
 Group:          System/Packages
 Provides:       yast2-packagemanager-devel
@@ -135,7 +135,7 @@ cd ..
 %{find_lang} zypp
 
 %post
-%run_ldconfig
+/sbin/ldconfig
 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
@@ -193,7 +193,7 @@ if is_old ${LOCKSFILE}
 fi
 
 %postun
-%run_ldconfig
+/sbin/ldconfig
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -219,7 +219,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{prefix}/bin/package-manager-su
 %{_libdir}/libzypp*so.*
 %doc %_mandir/man5/locks.5.*
-%{_sysconfdir}/logrotate.d/zypp-history.lr
+%config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
 
 %files devel
 %defattr(-,root,root)
@@ -230,6 +230,10 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/pkgconfig/libzypp.pc
 
 %changelog
+* Mon Oct 20 2008 mrueckert@suse.de
+- fix rpmlint warnings
+- use requires_eq
+- dont use deprecated macros
 * Thu Oct 16 2008 dmacvicar@suse.de
 - don't take into account stat information when looking
   for remote SHA1SUMS (part of bnc#409927)