[packages/adapter: 366/631] - fix-info-dir corrections

glen glen at pld-linux.org
Mon Sep 12 20:05:07 CEST 2016


commit d11acde941d4075e6ddf26b5e7fb65aee4ffa17d
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Mar 27 14:01:39 2007 +0000

    - fix-info-dir corrections
    
    Changed files:
        adapter.awk -> 1.353

 adapter.awk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 3a2cb61..fea90ab 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -600,7 +600,7 @@ function b_makekey(a, b,	s) {
 }
 /^%preun/, (!/^%preun/ && $0 ~ SECTIONS) {
 	preamble = 0
-	use_script_macros()
+	use_macros()
 }
 /^%postun/, (!/^%postun/ && $0 ~ SECTIONS) {
 	preamble = 0
@@ -1303,7 +1303,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("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\\&1")
 	$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
 	$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
 	$0 = fixedsub("CXXFLAGS=%{rpmcflags} %configure", "CXXFLAGS=%{rpmcflags}\n%configure", $0);
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list