- umask for mkdir in pretrans

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index d0a07d89d7b5742e109dd3ecea1189faa2a71722..81b7fed41b942c509cc8f37bc42c8f482bbb862a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
 #
 # TODO:
-# - manuals are not compressed
+# - check if we want shell autodeps: Requires: executable(ln) executable(mv)
 # - %{_arch} = i686 not as used to be i386:
 #   5.0.2: rpm -E '%_target_base_arch %_arch'
 #          i386 i686
@@ -22,7 +22,7 @@
 #   /usr/lib/rpm/osgideps.pl
 #   /usr/lib/rpm/perldeps.pl
 #   /usr/lib/rpm/vcheck
-#   /usr/share/man/man8/rpmconstant.8.gz
+#   /usr/share/man/man8/rpmconstant.8
 #
 # Conditional build:
 %bcond_with    static          # build static rpm+rpmi
@@ -62,12 +62,12 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       5.0.2
-Release:       0.6
+Version:       5.0.3
+Release:       0.2
 License:       LGPL
 Group:         Base
 Source0:       http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
-# Source0-md5: 596aaf5cd9dea7195f625530bc89e684
+# Source0-md5: b3df4e54e84cf3344ce6b76fa2a8d5bf
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -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
@@ -112,7 +113,6 @@ Patch8:             %{name}-php-macros.patch
 Patch9:                %{name}-gettext-in-header.patch
 Patch10:       %{name}-compress-doc.patch
 Patch11:       %{name}-lua.patch
-Patch12:       %{name}-scaremem.patch
 
 Patch14:       %{name}-etc_dir.patch
 Patch16:       %{name}-php-deps.patch
@@ -631,6 +631,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
@@ -640,7 +641,6 @@ Python para manipular pacotes e bancos de dados RPM.
 %patch9 -p1
 %patch10 -p1
 %{?with_system_lua:%patch11 -p1}
-%patch12 -p1
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
@@ -1001,12 +1001,16 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuil
        ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+# Append rpm.platform contents to /usr/lib/rpm/${arch}-linux/macros
+for m in $RPM_BUILD_ROOT%{_rpmlibdir}/*/macros ; do
+       cat %{SOURCE2} | %{__sed} 's#@LIB@#%{_lib}#' >> $m
+done
 # remove arch dependant macros which have no use on noarch
-#%{__sed} -i -e '
-#/{__spec_install_post_strip}/d
-#/{__spec_install_post_chrpath}/d
-#/{__spec_install_post_compress_modules}/d
-#' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+%{__sed} -i -e '
+/{__spec_install_post_strip}/d
+/{__spec_install_post_chrpath}/d
+/{__spec_install_post_compress_modules}/d
+' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
 # Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio
 mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
@@ -1038,6 +1042,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