- updated perl-macros patch to handle different forms of "require version" deps

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index d69d31e1651985b2bce214719449c03c5411ecbc..c1acf87dcb9eee462dd10f363a41befb65f20f4f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -63,7 +63,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.0.3
-Release:       0.1
+Release:       0.2
 License:       LGPL
 Group:         Base
 Source0:       http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
@@ -103,6 +103,7 @@ Source111:  %{name}-macros-amd64
 
 #Patch0:               %{name}-pl.po.patch
 Patch1:                %{name}-man_pl.patch
+Patch2:                %{name}-popt-downgrade.patch
 Patch3:                %{name}-rpmpopt.patch
 Patch4:                %{name}-perl-macros.patch
 Patch5:                %{name}-perl-req-perlfile.patch
@@ -116,8 +117,6 @@ Patch11:    %{name}-lua.patch
 Patch14:       %{name}-etc_dir.patch
 Patch16:       %{name}-php-deps.patch
 
-Patch18:       %{name}-perl_req.patch
-
 Patch23:       %{name}-pkgconfigdeps.patch
 
 Patch26:       %{name}-notsc.patch
@@ -630,6 +629,7 @@ Python para manipular pacotes e bancos de dados RPM.
 # APPLIED ALREADY? translationproject.org is used now
 #%%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -642,7 +642,6 @@ Python para manipular pacotes e bancos de dados RPM.
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
-%patch18 -p1
 echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
 echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl
 echo '# obsoleted file' > macros.python
@@ -1040,6 +1039,7 @@ rm -f /var/lib/rpm/__db*
 %pretrans
 # this needs to be a dir
 if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
+       umask 022
        mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
        mkdir %{_sysconfdir}/rpm/sysinfo
 fi