- rpm.macros 1.130 (use SUSv2-compliant chown syntax)

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 43ad73f223a27f154d63e4e0274b98a5fb982334..032569b717000c084ae5e49e0f27965cd63963e9 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
 %define        reqdb_ver       4.1.25-1
 %define        reqpopt_ver     1.9
 %define        beecrypt_ver    3.0.0-0.20030610.1
-%define rpm_macros_rev 1.124
+%define rpm_macros_rev 1.130
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -29,8 +29,7 @@ Summary(uk):  
 Name:          rpm
 %define        ver     4.3
 Version:       %{ver}
-%define        rel     0.%{snap}.20.5
-Release:       %{rel}
+Release:       0.%{snap}.25
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
@@ -76,7 +75,7 @@ Patch16:      %{name}-etc_dir.patch
 Patch17:       %{name}-system_libs-more.patch
 Patch18:       %{name}-php-deps.patch
 Patch19:       %{name}-python-fix.patch
-#Patch20:      %{name}-spec-prep-pre.patch
+Patch20:       %{name}-ldconfig-always.patch
 Patch21:       %{name}-perl_req.patch
 Patch22:       %{name}-system_libs_more.patch
 Patch23:       %{name}-python_2_3.patch
@@ -91,6 +90,7 @@ Patch31:      %{name}-fdClose-typo.patch
 Patch32:       %{name}-userpmdepswrappers.patch
 Patch33:       %{name}-provides-dont-obsolete.patch
 Patch34:       %{name}-examplesaredoc.patch
+Patch35:       %{name}-po.patch
 URL:           http://www.rpm.org/
 Icon:          rpm.gif
 BuildRequires: autoconf >= 2.52
@@ -195,7 +195,7 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
 Summary(uk):   èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:         Development/Libraries
-Requires:      %{name}-lib = %{version}
+Requires:      %{name}-lib = %{version}-%{release}
 Requires:      beecrypt-devel >= %{beecrypt_ver}
 Requires:      bzip2-devel
 Requires:      db-devel
@@ -256,7 +256,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
 Summary(uk):   óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 Requires:      beecrypt-static >= %{beecrypt_ver}
 Requires:      bzip2-static
 Requires:      db-static
@@ -291,7 +291,7 @@ Summary:    Additional utilities for managing rpm packages and database
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      popt >= %{reqpopt_ver}
 
 %description utils
@@ -308,8 +308,7 @@ Summary:    Additional utilities for managing rpm packages and database
 Summary(de):   Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):   Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:         Applications/File
-Requires:      %{name} = %{version}
-Requires:      %{name}-utils = %{version}
+Requires:      %{name}-utils = %{version}-%{release}
 Requires:      popt >= %{reqpopt_ver}
 
 %description utils-perl
@@ -321,12 +320,11 @@ Zusatzwerkzeuge f
 %description utils-perl -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
 
-
 %package utils-static
 Summary:       Static rpm utilities
 Summary(pl):   Statyczne narzêdzia rpm
 Group:         Applications/System
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description utils-static
 Static rpm utilities for repairing system in case something with
@@ -346,7 +344,7 @@ Summary:    Additional utilities for checking perl provides/requires in rpm package
 Summary(de):   Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Summary(pl):   Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:         Applications/File
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      perl-devel
 Requires:      perl-modules
 
@@ -365,7 +363,7 @@ pakietach rpm.
 Summary:       Python macros, which simplifies creation of rpm packages with Python software
 Summary(pl):   Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
 Group:         Applications/File
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      python-modules
 
 %description pythonprov
@@ -380,7 +378,7 @@ Pythonie.
 Summary:       Additional utilities for managing rpm packages and database
 Summary(pl):   Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm
 Group:         Applications/File
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description php-pearprov
 Additional utilities for checking php pear provides/requires in rpm
@@ -395,7 +393,7 @@ Summary:    Python interface to RPM library
 Summary(pl):   Pythonowy interfejs do biblioteki RPM-a
 Summary(pt_BR):        Módulo Python para aplicativos que manipulam pacotes RPM
 Group:         Development/Languages/Python
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 %pyrequires_eq python
 Obsoletes:     rpm-python
 
@@ -444,8 +442,7 @@ Summary(ru):        
 Summary(uk):   óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
 Group:         Applications/File
 Requires(pre): findutils
-Requires:      %{name} = %{version}
-Requires:      %{name}-utils = %{version}
+Requires:      %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
 Requires:      binutils
@@ -499,7 +496,7 @@ Summary(pt_BR):     Scripts e programas execut
 Summary(ru):   óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ×
 Summary(uk):   óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
 Group:         Applications/File
-Requires:      %{name}-build = %{version}
+Requires:      %{name}-build = %{version}-%{release}
 # these are optional
 #Requires:     cvs
 #Requires:     wget
@@ -547,7 +544,7 @@ construir pacotes usando o RPM.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-# patch20 -- look down
+%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
@@ -563,7 +560,6 @@ install %{SOURCE12} scripts/php.prov.in
 install %{SOURCE13} scripts/php.req.in
 install %{SOURCE33} scripts/perl.prov
 cat %{SOURCE14} >> macros.in
-# %patch20 -p1 -- merged into macros
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
@@ -574,6 +570,7 @@ cat %{SOURCE14} >> macros.in
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 cd scripts;
 mv -f perl.req perl.req.in
@@ -695,6 +692,9 @@ libgtkmozembed.so
 libgtksuperwin.so
 libxpcom.so
 EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <<EOF
+# global list of file masks not to be compressed in DOCDIR
+EOF
 
 # for rpm -e|-U --repackage
 install -d $RPM_BUILD_ROOT/var/spool/repackage
@@ -705,6 +705,9 @@ for a in librpm-%{ver}.so librpmdb-%{ver}.so librpmio-%{ver}.so ; do
        ln -s /lib/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+for f in $RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo ; do
+       [ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f
+done
 %find_lang %{name}
 
 rm -rf manual