packages: texinfo/texinfo.spec - invoke fix-info-dir via /sbin/postshell wh...

Mon May 18 16:50:00 CEST 2009

Author: glen                         Date: Mon May 18 14:50:00 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
- BR: rpm >= 4.4.9-56 for the %{pld_release} macro

---- Files affected:
packages/texinfo:
   texinfo.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/texinfo/texinfo.spec
diff -u packages/texinfo/texinfo.spec:1.118 packages/texinfo/texinfo.spec:1.119

--- packages/texinfo/texinfo.spec:1.118	Sat May 16 21:31:39 2009
+++ packages/texinfo/texinfo.spec	Mon May 18 16:49:55 2009
@@ -25,6 +25,7 @@
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	help2man
 BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	zlib-devel
 Requires:	info = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -223,8 +224,8 @@
 %postun	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%post -n info
-/usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%post -n info -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
@@ -271,11 +272,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2009/05/18 14:49:55  glen
+- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
+- BR: rpm >= 4.4.9-56 for the %{pld_release} macro
+
 Revision 1.118  2009/05/16 19:31:39  hawk
 - for time being switch back to tetex in Titanium
 
 Revision 1.117  2009/03/30 20:43:14  uzsolt
-- swithc to texlive
+- switch to texlive
 - rel 3
 
 Revision 1.116  2008/11/03 22:05:03  arekm
@@ -377,7 +382,7 @@
 - dropped unused zlib patch from spec
 
 Revision 1.88  2003/12/10 17:52:45  grzegol
-- removed Help directory from %%{_desktopdir}
+- removed Help directory from %{_desktopdir}
 
 Revision 1.87  2003/12/04 14:20:33  adgor
 - Switched to vfolders
@@ -425,7 +430,7 @@
 - zlib patch not updated - shouldn't it go to /dev/null?
 
 Revision 1.73  2002/11/24 19:27:07  qboosh
-- don't fix what isn't broken - current %%__gettextize handles this too
+- don't fix what isn't broken - current %__gettextize handles this too
 
 Revision 1.72  2002/11/22 22:08:24  mmazur
 - one hell of a wierd gettext usage... hope I haven't broken anything :)
@@ -436,12 +441,12 @@
 - merge translations from KSI.
 
 Revision 1.70  2002/06/23 20:52:53  kloczek
-perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/"
+- perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
 
 Revision 1.69  2002/05/21 23:14:49  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.68  2002/05/07 13:23:25  kloczek
 - updated to 4.2 (releas 2),
@@ -473,10 +478,10 @@
 - removed dummy es info description
 
 Revision 1.60  2002/02/11 10:33:32  kloczek
-- added %%{_bindir}/infokey to info %file list.
+- added %{_bindir}/infokey to info %file list.
 
 Revision 1.59  2002/02/11 10:31:10  kloczek
-- release 2: added missing %%{_datadir}/texinfo with texinfo dtd and xsl sheet.
+- release 2: added missing %{_datadir}/texinfo with texinfo dtd and xsl sheet.
 
 Revision 1.58  2002/02/09 15:20:03  kloczek
 - merge translations from Conectiva.
@@ -486,7 +491,7 @@
 - removed outdated patches.
 
 Revision 1.56  2002/01/18 02:15:10  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.55  2002/01/03 12:27:24  kloczek
 - release 7: move desktop file to Help menu.
@@ -503,7 +508,7 @@
 
 Revision 1.51  2001/10/25 08:04:42  qboosh
 - texi2dvi moved to -texi2dvi subpackage (because only texi2dvi requires tetex)
-- info/README moved to %%doc in info subpackage
+- info/README moved to %doc in info subpackage
 - release 3, STBR
 
 Revision 1.50  2001/10/21 12:41:39  kloczek
@@ -556,10 +561,10 @@
 - rebuild with ncurses 5.1
 
 Revision 1.37  2000/06/09 07:55:12  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.36  2000/06/09 07:24:00  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.35  2000/05/24 16:50:46  zagrodzki
 - changed [ -x ... ] && to [ ! -x ... ] ||
@@ -590,7 +595,7 @@
 
 Revision 1.28  2000/03/30 20:33:47  kloczek
 - release 6,
-- removed declare localy %%{_applnkdir} macro (now it is predefined).
+- removed declare localy %{_applnkdir} macro (now it is predefined).
 
 Revision 1.27  2000/03/30 17:09:45  zagrodzki
 - Requires: mktemp in %package info
@@ -612,7 +617,7 @@
 - added BuildRequires: ncurses-devel,
 - added fix info index entries for info, info-std (ne info patch),
 - added man pages,
-- removed using %%{_sysconfdir} macro,
+- removed using %{_sysconfdir} macro,
 - added woraroud for building correctly info pages (make distclean-aminfo in
   doc dir on start building).
 
@@ -633,20 +638,14 @@
 - removed texinfo-exe.patch texinfo-alpha-tioc.patch (integrated)
 - added texinfo-fix-info-dir.patch
 - added Requires: mktemp
-- used fix-info-dir in %%post/%%postun
-- info-dir now in %%{_infodir}/dir
+- used fix-info-dir in %post/%postun
+- info-dir now in %{_infodir}/dir
 
 Revision 1.18  1999/09/04 09:05:30  wiget
- - /etc/X11/applnk -> /usr/X11R6/share/applnk
+- /etc/X11/applnk -> /usr/X11R6/share/applnk
 
 Revision 1.17  1999/07/20 12:48:10  wiget
 - switch to rpm 3.0.2
 
 Revision 1.16  1999/07/12 23:06:15  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Wed Jul  7 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [3.12h-3]
-- based on RH spec,
-- spec rewrited by PLD team,
-- pl translation by Ziemek Borowski <ziembor at faq-bot.ceu.edu.pl>.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texinfo/texinfo.spec?r1=1.118&r2=1.119&f=u

