SHA256
6
0
forked from pool/rpm

- update to rpm-4.10.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=213
This commit is contained in:
2012-08-28 13:31:44 +00:00
committed by Git OBS Bridge
parent 2995f03e34
commit ff04a9b972
42 changed files with 814 additions and 2391 deletions

View File

@@ -1,10 +1,8 @@
SUSE specific platform changes.
Index: platform.in
===================================================================
--- platform.in.orig 2011-12-11 09:27:18.000000000 +0100
+++ platform.in 2011-12-11 09:29:47.564232873 +0100
@@ -21,7 +21,7 @@
--- ./platform.in.orig 2012-03-20 08:07:25.000000000 +0000
+++ ./platform.in 2012-06-01 12:42:30.000000000 +0000
@@ -29,7 +29,7 @@
%_exec_prefix @exec_prefix@
%_bindir @bindir@
%_sbindir @sbindir@
@@ -13,7 +11,7 @@ Index: platform.in
%_datarootdir @datarootdir@
%_datadir @datadir@
%_sysconfdir @sysconfdir@
@@ -33,7 +33,7 @@
@@ -41,7 +41,7 @@
%_oldincludedir @oldincludedir@
%_infodir @infodir@
%_mandir @mandir@
@@ -22,25 +20,25 @@ Index: platform.in
# Deprecated misspelling, present for backwards compatibility.
%_initrddir %{_initddir}
@@ -143,3 +143,21 @@
@mandrake@%_gamesdir games
@mandrake@%_gamesbindir %{_prefix}/%{_gamesdir}
@mandrake@%_gamesdatadir %{_datadir}/%{_gamesdir}
+@SuSE@#---------------------------------------------------------------------
+@SuSE@# Expanded at end of %prep
+@SuSE@#
+@SuSE@%__id_u %{__id} -u
+@SuSE@%__chown_Rhf %{__chown} -Rhf
+@SuSE@%__chgrp_Rhf %{__chgrp} -Rhf
+@SuSE@%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
+@SuSE@%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root
+@SuSE@%_fixperms %{__chmod} -Rf @FIXPERMS@
+@SuSE@
+@SuSE@#---------------------------------------------------------------------
+@SuSE@# Expanded at start of %build
+@SuSE@#
+@SuSE@%__spec_build_pre %{___build_pre}\
+@SuSE@%{?buildroot: %__rm -rf "$RPM_BUILD_ROOT"\
+@SuSE@ %__mkdir_p `dirname "$RPM_BUILD_ROOT"`\
+@SuSE@ %__mkdir "$RPM_BUILD_ROOT"\
+@SuSE@}
@@ -78,3 +78,21 @@
@apple@#
@apple@%_use_internal_dependency_generator 0
@apple@%__so dylib
+@suse@#---------------------------------------------------------------------
+@suse@# Expanded at end of %prep
+@suse@#
+@suse@%__id_u %{__id} -u
+@suse@%__chown_Rhf %{__chown} -Rhf
+@suse@%__chgrp_Rhf %{__chgrp} -Rhf
+@suse@%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
+@suse@%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root
+@suse@%_fixperms %{__chmod} -Rf @FIXPERMS@
+@suse@
+@suse@#---------------------------------------------------------------------
+@suse@# Expanded at start of %build
+@suse@#
+@suse@%__spec_build_pre %{___build_pre}\
+@suse@%{?buildroot: %__rm -rf "$RPM_BUILD_ROOT"\
+@suse@ %__mkdir_p `dirname "$RPM_BUILD_ROOT"`\
+@suse@ %__mkdir "$RPM_BUILD_ROOT"\
+@suse@}