- [ix86] s/-mcpu/-mtune/. -mcpu is deprecated.

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 039b0f7ab31432938e05e006e55cb7a006c9411f..78455cd2f5d4087d3a3f6053cf3b30ceee29cbbf 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@
 %define        reqdb_ver       4.2.50-1
 %define        reqpopt_ver     1.9
 %define        beecrypt_ver    2:4.1.0
-%define        rpm_macros_rev  1.167
+%define        rpm_macros_rev  1.183
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -32,7 +32,7 @@ Name:         rpm
 %define        ver     4.4
 %define        sover   4.4
 Version:       %{ver}
-Release:       0.%{snap}.0.1
+Release:       0.%{snap}.0.7
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
@@ -56,6 +56,8 @@ Source14:     %{name}.sysconfig
 Source30:      builder
 Source31:      adapter.awk
 Source32:      pldnotify.awk
+# http://svn.pld-linux.org/banner.sh/
+Source33:      banner.sh
 Patch1:                %{name}-rpmrc.patch
 Patch2:                %{name}-arch.patch
 Patch3:                %{name}-rpmpopt.patch
@@ -95,6 +97,7 @@ Patch44:      %{name}-debuginfo.patch
 Patch45:       %{name}-beecrypt4.patch
 Patch46:       %{name}-doxygen_hack.patch
 Patch47:       %{name}-distver.patch
+Patch48:       %{name}-gcc4.patch
 Patch100:      %{name}-pl.po.patch
 URL:           http://www.rpm.org/
 Icon:          rpm.gif
@@ -470,6 +473,7 @@ Requires:   %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
 Requires:      binutils
+Requires:      bzip2
 Requires:      chrpath >= 0.10-4
 Requires:      cpio
 Requires:      diffutils
@@ -626,6 +630,7 @@ cat %{SOURCE11} >> macros.in
 # NEEDS UPDATE
 # %patch46 -p1
 %{?with_distver:%patch47 -p1}
+%patch48 -p1
 # NEEDS UPDATE
 #%patch100 -p1
 %patch3 -p1
@@ -732,6 +737,7 @@ install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
 install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk
 install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk
+install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
@@ -891,6 +897,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh
 %attr(755,root,root) %{_rpmlibdir}/user_group.sh
 
+%attr(755,root,root) %{_bindir}/banner.sh
+
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
@@ -978,11 +986,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_includedir}/rpm
 %{_libdir}/librpm*.la
 %attr(755,root,root) %{_libdir}/librpm.so
-%attr(755,root,root) %{_libdir}/librpm-*.so
+%attr(755,root,root) %{_libdir}/librpm-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmio.so
-%attr(755,root,root) %{_libdir}/librpmio-*.so
+%attr(755,root,root) %{_libdir}/librpmio-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmdb.so
-%attr(755,root,root) %{_libdir}/librpmdb-*.so
+%attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmbuild.so
 
 %files static