[packages/adapter: 168/631] - fix fix-info-dir misuse in %post

glen glen at pld-linux.org
Mon Sep 12 19:48:32 CEST 2016


commit db6f584424a6c2a645c52c4cde64855d9054e23e
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Jul 15 07:01:45 2005 +0000

    - fix fix-info-dir misuse in %post
    
    Changed files:
        adapter.awk -> 1.162

 adapter.awk | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index 9604408..aeae968 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -343,6 +343,7 @@ defattr == 1 {
 }
 /^%post/, (/^%[a-z]+$/ && !/^%post/) {
 	preamble = 0
+	use_macros()
 }
 /^%preun/, (/^%[a-z]+$/ && !/^%preun/) {
 	preamble = 0
@@ -703,6 +704,7 @@ function use_macros()
 	gsub("%{compat_perl_vendorarch}", "%{perl_vendorarch}")
 
 	gsub("^%{__make} install DESTDIR=\$RPM_BUILD_ROOT", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
+	gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\&1")
 
 	gsub("/usr/src/linux", "%{_kernelsrcdir}")
 	gsub("%{_prefix}/src/linux", "%{_kernelsrcdir}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885



More information about the pld-cvs-commit mailing list