packages (AC-branch): gawk/gawk.spec - partial head merge

[glen]

Author: glen                         Date: Fri Feb 19 11:28:04 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- partial head merge

---- Files affected:
packages/gawk:
   gawk.spec (1.88.2.1 -> 1.88.2.2) 

---- Diffs:

================================================================
Index: packages/gawk/gawk.spec
diff -u packages/gawk/gawk.spec:1.88.2.1 packages/gawk/gawk.spec:1.88.2.2
--- packages/gawk/gawk.spec:1.88.2.1	Fri Feb 19 12:27:05 2010
+++ packages/gawk/gawk.spec	Fri Feb 19 12:27:58 2010
@@ -147,11 +147,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -166,7 +166,7 @@
 %lang(it) %{_mandir}/it/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_infodir}/*info*
+%{_infodir}/*.info*
 %attr(755,root,root) %{_libdir}/awk
 %{_datadir}/awk
 
@@ -180,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88.2.2  2010/02/19 11:27:58  glen
+- partial head merge
+
 Revision 1.88.2.1  2010/02/19 11:27:05  glen
 - utf8 & adapter & partial head merge
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gawk/gawk.spec?r1=1.88.2.1&r2=1.88.2.2&f=u