Author: glen Date: Fri Oct 28 20:41:52 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- moved _fix* macros to rpm.platform as macros.in describes they were moved there
---- Files affected:
SOURCES:
rpm.platform (1.5 -> 1.6) , rpm.macros (1.158.4.76 -> 1.158.4.77)
---- Diffs:
================================================================
Index: SOURCES/rpm.platform
diff -u SOURCES/rpm.platform:1.5 SOURCES/rpm.platform:1.6
--- SOURCES/rpm.platform:1.5 Tue Feb 15 14:30:40 2005
+++ SOURCES/rpm.platform Fri Oct 28 22:41:47 2005
@@ -1,4 +1,14 @@
# PLD rpm macros
+
+%__id @__ID@
+%__id_u %{__id} -u
+%__chown_Rhf @__CHOWN_RHF@
+%__chgrp_Rhf @__CHGRP_RHF@
+
+%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root:@ROOT_GROUP@
+%_fixgroup true
+%_fixperms %{__chmod} -Rf @FIXPERMS@
+
%_exec_prefix %{_prefix}
%_bindir %{_exec_prefix}/bin
%_sbindir %{_exec_prefix}/sbin
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.76 SOURCES/rpm.macros:1.158.4.77
--- SOURCES/rpm.macros:1.158.4.76 Fri Oct 28 22:40:04 2005
+++ SOURCES/rpm.macros Fri Oct 28 22:41:47 2005
@@ -4,14 +4,6 @@
%epoch 0
%_enable_debug_packages 0
-%__id @__ID@
-%__id_u %{__id} -u
-%__chown_Rhf @__CHOWN_RHF@
-%__chgrp_Rhf @__CHGRP_RHF@
-
-%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root:@ROOT_GROUP@
-%_fixgroup true
-%_fixperms %{__chmod} -Rf @FIXPERMS@
%_topdir %(echo $HOME)/rpm
#-----------------------------------------------------------------
# CFLAGS and LDFLAGS used to build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.platform?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.76&r2=1.158.4.77&f=u