Author: glen Date: Fri Oct 28 21:28:52 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from AC-branch
---- Files affected:
SOURCES:
rpm.macros (1.254 -> 1.255)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.254 SOURCES/rpm.macros:1.255
--- SOURCES/rpm.macros:1.254 Fri Oct 28 22:40:04 2005
+++ SOURCES/rpm.macros Fri Oct 28 23:28:46 2005
@@ -4,14 +4,6 @@
%epoch 0
%_enable_debug_packages 1
-%__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
@@ -134,7 +126,10 @@
unset LINGUAS ||:\
%{nil}
-%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+%install \
+%if 0%{?_enable_debug_packages}\
+%{?buildsubdir:%{debug_package}}\
+%endif\
%%install\
LANG=C\
export LANG\
@@ -298,7 +293,7 @@
%{?verbose:set -x;} \
if [ -d "$RPM_BUILD_ROOT" ]; then \
echo "Strip executable binaries, archives and shared object files."; \
- filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"
%{?_noautostrip:! -regex "%{_noautostrip}"}`; \
+ filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" !
-regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex
"%{_noautostrip}"}`; \
elfexelist=`echo $filelist | xargs -r file | \
awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
elfsharedlist=`echo $filelist | xargs -r file | \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.254&r2=1.255&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
