SPECS: make.spec - fix-info-dir existence is optional

glen glen at pld-linux.org
Sun Sep 7 04:47:11 CEST 2008


Author: glen                         Date: Sun Sep  7 02:47:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix-info-dir existence is optional

---- Files affected:
SPECS:
   make.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/make.spec
diff -u SPECS/make.spec:1.78 SPECS/make.spec:1.79
--- SPECS/make.spec:1.78	Sat Sep  6 22:51:21 2008
+++ SPECS/make.spec	Sun Sep  7 04:47:05 2008
@@ -116,7 +116,7 @@
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-echo '#MAKE="/usr/bin/make -j2"' > $RPM_BUILD_ROOT/etc/env.d/MAKE
+echo '#MAKE="%{_bindir}/make -j2"' > $RPM_BUILD_ROOT/etc/env.d/MAKE
 
 %find_lang %{name}
 
@@ -124,11 +124,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/fix-info-dir -c %{_infodir}
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 %env_update
 
 %postun
-/usr/sbin/fix-info-dir -c %{_infodir}
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 %env_update
 
 %files -f %{name}.lang
@@ -150,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2008/09/07 02:47:05  glen
+- fix-info-dir existence is optional
+
 Revision 1.78  2008/09/06 20:51:21  gotar
 - added /etc/env.d/MAKE
 
@@ -255,7 +258,7 @@
 - release 15.
 
 Revision 1.45  2002/06/12 14:20:23  qboosh
-- added ac253 patch for autoconf 2.53, new %%doc
+- added ac253 patch for autoconf 2.53, new %doc
 
 Revision 1.44  2002/05/26 14:15:10  kloczek
 - merge translations from KSI and Conectiva.
@@ -267,9 +270,9 @@
 - Release 14.
 
 Revision 1.42  2002/05/21 23:14:07  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.41  2002/03/24 23:28:21  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -282,7 +285,7 @@
   Group field using gettext).
 
 Revision 1.38  2002/01/18 02:13:48  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.37  2001/11/15 23:23:30  ankry
 - added da, es, ja, nl man pages
@@ -296,7 +299,7 @@
 - reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.33  2001/07/06 11:22:33  wiget
-release 11; remove some macros from acinclude.m4
+- release 11; remove some macros from acinclude.m4
 
 Revision 1.32  2001/05/02 12:06:00  mkochano
 - Release 10.
@@ -311,7 +314,7 @@
 - release 8: added automake to BuildRequires.
 
 Revision 1.29  2001/02/15 19:27:19  misiek
-%{__automake}
+- %{__automake}
 
 Revision 1.28  2000/10/23 20:47:49  kloczek
 - release 7,
@@ -326,10 +329,10 @@
 - release 2.
 
 Revision 1.25  2000/06/09 07:54:44  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.24  2000/06/09 07:23:25  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.23  2000/05/31 12:46:32  kloczek
 - spec adapterized.
@@ -380,8 +383,3 @@
 
 Revision 1.13  1999/07/12 23:06:07  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Thu May 27 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [3.77-7]
-- based on RH spec,
-- spec rewrited by PLD team.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/make.spec?r1=1.78&r2=1.79&f=u



More information about the pld-cvs-commit mailing list