OBS User unknown 2008-10-22 16:19:02 +00:00 committed by Git OBS Bridge
parent 4d69639580
commit 197adffc30
2 changed files with 18 additions and 7 deletions

View File

@ -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 Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de

View File

@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management Summary: Package, Patch, Pattern, and Product Management
Version: 5.16.1 Version: 5.16.1
Release: 2 Release: 3
Source: libzypp-5.16.1.tar.bz2 Source: libzypp-5.16.1.tar.bz2
Source1: libzypp-rpmlintrc Source1: libzypp-rpmlintrc
Patch0: libzypp-bnc-409927.patch Patch0: libzypp-bnc-409927.patch
@ -36,7 +36,7 @@ BuildRequires: cmake
BuildRequires: libsatsolver-devel >= 0.11.0 openssl-devel BuildRequires: libsatsolver-devel >= 0.11.0 openssl-devel
BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: hicolor-icon-theme rpm-devel update-desktop-files BuildRequires: hicolor-icon-theme update-desktop-files
Requires: uuid-runtime Requires: uuid-runtime
%endif %endif
%if 0%{?fedora_version} %if 0%{?fedora_version}
@ -50,10 +50,11 @@ Requires: e2fsprogs
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: gpg2 Requires: gpg2
Recommends: logrotate
%else %else
Requires: gnupg Requires: gnupg
%endif %endif
Requires: satsolver-tools == %( echo `rpm -q --queryformat '%{VERSION}' satsolver-tools`) %requires_eq satsolver-tools
%description %description
Package, Patch, Pattern, and Product Management 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: 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: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
Requires: cmake libsatsolver-devel >= 0.10.14 Requires: cmake libsatsolver-devel >= 0.10.14
Recommends: logrotate
Summary: Package, Patch, Pattern, and Product Management - developers files Summary: Package, Patch, Pattern, and Product Management - developers files
Group: System/Packages Group: System/Packages
Provides: yast2-packagemanager-devel Provides: yast2-packagemanager-devel
@ -135,7 +135,7 @@ cd ..
%{find_lang} zypp %{find_lang} zypp
%post %post
%run_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
#%{prefix}/lib/zypp/zypp-migrate-sources #%{prefix}/lib/zypp/zypp-migrate-sources
# convert old lock file to new # convert old lock file to new
@ -193,7 +193,7 @@ if is_old ${LOCKSFILE}
fi fi
%postun %postun
%run_ldconfig /sbin/ldconfig
%clean %clean
rm -rf "$RPM_BUILD_ROOT" rm -rf "$RPM_BUILD_ROOT"
@ -219,7 +219,7 @@ rm -rf "$RPM_BUILD_ROOT"
%{prefix}/bin/package-manager-su %{prefix}/bin/package-manager-su
%{_libdir}/libzypp*so.* %{_libdir}/libzypp*so.*
%doc %_mandir/man5/locks.5.* %doc %_mandir/man5/locks.5.*
%{_sysconfdir}/logrotate.d/zypp-history.lr %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -230,6 +230,10 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/pkgconfig/libzypp.pc %{_libdir}/pkgconfig/libzypp.pc
%changelog %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 * Thu Oct 16 2008 dmacvicar@suse.de
- don't take into account stat information when looking - don't take into account stat information when looking
for remote SHA1SUMS (part of bnc#409927) for remote SHA1SUMS (part of bnc#409927)