- fix static subpackage Requires

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index e97817a3820d28d90bd7ca2c42020faf2b542fce..69e14bf274baaedc6e492195e8681161d9a769ea 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,16 +1,24 @@
+#
+# TODO:
+# - learn find-perl-provides to use the __perl macro instead
+#   of /usr/bin/perl
+#
 %include        /usr/lib/rpm/macros.python
 %define        beecrypt_ver    2.2.0
 %define        beecrypt_rel    2
+# versions of required libraries
+%define        reqdb_ver       4.1.25-1
+%define        reqpopt_ver     1.7
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
 Summary(pl):   Aplikacja do zarz±dzania pakietami RPM
 Summary(pt_BR):        Gerenciador de pacotes RPM
-Summary(ru):   íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ Red Hat
-Summary(uk):   íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä Red Hat
+Summary(ru):   íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM
+Summary(uk):   íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:          rpm
 Version:       4.1
-Release:       12
+Release:       14
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
@@ -37,6 +45,7 @@ Source20:     %{name}-find-php-requires
 Source30:      builder
 Source31:      adapter.awk
 Source32:      pldnotify.awk
+Source33:      perl.prov
 Patch0:                %{name}-pl.po.patch
 Patch1:                %{name}-%{name}rc.patch
 Patch2:                %{name}-arch.patch
@@ -54,7 +63,6 @@ Patch13:      %{name}-python-macros.patch
 Patch14:       %{name}-perlprov-regonly.patch
 Patch15:       %{name}-4.1-branch.patch
 Patch16:       %{name}-drop-legacy-CLI.patch
-Patch17:       %{name}-perlprov-perl5.6.patch
 Patch18:       %{name}-gettext-in-header.patch
 Patch19:       %{name}-compress-doc.patch
 Patch20:       %{name}-lt14d.patch
@@ -72,7 +80,7 @@ Icon:         rpm.gif
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: bzip2-devel >= 1.0.1
-BuildRequires: db-devel >= 4.1.25-1
+BuildRequires: db-devel >= %{reqdb_ver}
 BuildRequires: doxygen
 BuildRequires: gettext-devel >= 0.11.4-2
 BuildRequires: libelf-devel
@@ -82,15 +90,15 @@ BuildRequires:      python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: rpm-pythonprov
 BuildRequires: zlib-devel
-BuildRequires: popt-devel >= 1.7
+BuildRequires: popt-devel >= %{reqpopt_ver}
 %if %{!?_without_static:1}%{?_without_static:0}
 # Require static library only for static build
 BuildRequires: bzip2-static >= 1.0.2-5
-BuildRequires: db-static >= 4.1.25
+BuildRequires: db-static >= %{reqdb_ver}
 BuildRequires: glibc-static >= 2.2.94
 BuildRequires: libelf-static
 BuildRequires: zlib-static
-BuildRequires: popt-static >= 1.7
+BuildRequires: popt-static >= %{reqpopt_ver}
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:     glibc < 2.2.92
@@ -160,7 +168,6 @@ Summary(ru):        
 Summary(uk):   èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      beecrypt-devel
 Requires:      bzip2-devel
 Requires:      db-devel
 Requires:      libelf-devel
@@ -219,6 +226,11 @@ Summary(ru):       
 Summary(uk):   óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}
+Requires:      bzip2-static
+Requires:      db-static
+Requires:      libelf-static
+Requires:      popt-static >= 1.7
+Requires:      zlib-static
 
 %description static
 RPM static libraries.
@@ -344,7 +356,8 @@ Python para manipular pacotes e bancos de dados RPM.
 Summary:       RPMs library
 Summary(pl):   Biblioteki RPM-a
 Group:         Libraries
-Requires:      popt >= 1.7
+Requires:      db >= %{reqdb_ver}
+Requires:      popt >= %{reqpopt_ver}
 
 %description lib
 RPMs library.
@@ -507,7 +520,6 @@ Statyczna wersja biblioteki kryptograficznej.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
@@ -533,6 +545,7 @@ install %{SOURCE17} scripts/php.prov.in
 install %{SOURCE18} scripts/php.req.in
 install %{SOURCE19} scripts/find-php-provides
 install %{SOURCE20} scripts/find-php-requires
+install %{SOURCE33} scripts/perl.prov
 
 cd scripts;
 mv -f perl.req perl.req.in
@@ -749,9 +762,9 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/striptofile
 %attr(755,root,root) %{_bindir}/unstripfile
 # not here
-#%{_libdir}/rpm/rpm.daily
-#%{_libdir}/rpm/rpm.log
-#%{_libdir}/rpm/rpm.xinetd
+#%%{_libdir}/rpm/rpm.daily
+#%%{_libdir}/rpm/rpm.log
+#%%{_libdir}/rpm/rpm.xinetd
 %{_libdir}/rpm/rpm2cpio.sh
 
 %{_mandir}/man8/rpm2cpio.8*