[packages/rpm] - set binary payload to xzdio (same as lzdio, but uses current xz) - add settings provided by patche

baggins baggins at pld-linux.org
Wed Sep 12 13:51:26 CEST 2012


commit c73c505644fa30c3e32a596dbc4aea90cfac0bcc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Sep 12 13:24:58 2012 +0200

    - set binary payload to xzdio (same as lzdio, but uses current xz)
    - add settings provided by patches from mandriva
    - enable filetriggers support

 macros.pld.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/macros.pld.in b/macros.pld.in
index a232317..13a5819 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -107,7 +107,7 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %buildroot		%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 
 %_source_payload	w9.gzdio
-%_binary_payload	w9.lzdio
+%_binary_payload	w9.xzdio
 
 %_rpmfc_magic_path	/usr/share/file/magic
 
@@ -125,6 +125,13 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 # 2 - Use __scriptlet_requires to process scriptlet dependencies
 %_use_internal_dependency_generator	1
 
+%_duplicate_files_terminate_build	1
+%_files_listed_twice_terminate_build	1
+%_unpackaged_subdirs_terminate_build	0
+
+# activate filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers)
+%_filetriggers_dir /var/lib/rpm/filetriggers
+
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
@@ -176,7 +183,6 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %x8664 x86_64 amd64 ia32e
 %ppc   ppc ppc7400 ppc7450
 
-
 #---------------------------------------------------------------------
 #	Expanded at end of %prep
 #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/df7f86e73decf1d5a9521125617ac6dc7335adb5



More information about the pld-cvs-commit mailing list