SPECS: rpm.spec - partial merge from HEAD

[glen]

Author: glen                         Date: Sun Apr 30 14:33:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- partial merge from HEAD

---- Files affected:
SPECS:
   rpm.spec (1.742 -> 1.743) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.742 SPECS/rpm.spec:1.743
--- SPECS/rpm.spec:1.742	Thu Apr 27 09:59:56 2006
+++ SPECS/rpm.spec	Sun Apr 30 16:33:32 2006
@@ -818,6 +818,9 @@
 # SELinux file contexts policy instead of one stored in packages payload
 %%_install_file_context_path	%%{nil}
 %%_verify_file_context_path	%%{nil}
+
+# If non-zero, all erasures will be automagically repackaged.
+#%%_repackage_all_erasures    1
 EOF
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
@@ -907,7 +910,7 @@
 done
 
 # remove arch dependant macros which have no use on noarch
-sed -i -e '
+%{__sed} -i -e '
 /{__spec_install_post_strip}/d
 /{__spec_install_post_chrpath}/d
 /{__spec_install_post_compress_modules}/d
@@ -1157,6 +1160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.743  2006/04/30 14:33:32  glen
+- partial merge from HEAD
+
 Revision 1.742  2006/04/27 07:59:56  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.742&r2=1.743&f=u