SPECS (DEVEL): adapter.spec, adapter.awk - fix fix-info-dir misuse...

[glen]

Author: glen                         Date: Fri Jul 15 07:01:50 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fix fix-info-dir misuse in %post

---- Files affected:
SPECS:
   adapter.spec (1.26.2.5 -> 1.26.2.6) , adapter.awk (1.161 -> 1.162) 

---- Diffs:

================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.5 SPECS/adapter.spec:1.26.2.6
--- SPECS/adapter.spec:1.26.2.5	Fri Jun 17 23:47:19 2005
+++ SPECS/adapter.spec	Fri Jul 15 09:01:45 2005
@@ -93,6 +93,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+fix-info-dir
 
 %files
 %defattr(644,root,root,755)
@@ -132,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26.2.6  2005/07/15 07:01:45  glen
+- fix fix-info-dir misuse in %post
+
 Revision 1.26.2.5  2005/06/17 21:47:19  glen
 - replace py_sitescriptdir macro
 

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.161 SPECS/adapter.awk:1.162
--- SPECS/adapter.awk:1.161	Sun Jul 10 10:36:32 2005
+++ SPECS/adapter.awk	Fri Jul 15 09:01:45 2005
@@ -343,6 +343,7 @@
 }
 /^%post/, (/^%[a-z]+$/ && !/^%post/) {
 	preamble = 0
+	use_macros()
 }
 /^%preun/, (/^%[a-z]+$/ && !/^%preun/) {
 	preamble = 0
@@ -703,6 +704,7 @@
 	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}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.5&r2=1.26.2.6&f=u
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.161&r2=1.162&f=u