From: Artur Frysiak <artur@frysiak.net>
Date: Thu, 6 May 1999 23:05:46 +0000 (+0000)
Subject: - FHS 2.0 compilant changes
X-Git-Tag: texinfo-3_12h-3~15
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftexinfo.git;a=commitdiff_plain;h=2ae95f258a094ef20ae30c444a67fc7f3127b97d

- FHS 2.0 compilant changes
- moved locale stuff to info package to prevent prereq loop (info need this, texinfo need install-info from info)

Changed files:
    texinfo.spec -> 1.5
---

diff --git a/texinfo.spec b/texinfo.spec
index 7cd2876..b1c7be2 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -5,7 +5,7 @@ Summary(pl):	Texinfo -- formatter plik
 Summary(tr):	texinfo biçimleyici ve info okuyucu
 Name:		texinfo
 Version:	3.12f
-Release:	5
+Release:	6
 Copyright:	GPL
 Group:		Applications/Publishing
 Group(pl):	Aplikacje/Publikowanie
@@ -17,7 +17,9 @@ Patch1:		texinfo-fix.patch
 Patch2:		texinfo-alpha-tioc.patch
 Patch3:		texinfo-zlib.patch
 Patch4:		texinfo-info.patch
+BuildPrereq:	autoconf >= 1.13-8
 Prereq:		/sbin/install-info
+Requires:	info = %{version}
 Buildroot:	/tmp/%{name}-%{version}-root
 
 %description
@@ -54,8 +56,6 @@ Summary(pl):	Samodzielny, bazuj
 Summary(tr):	GNU texinfo belgeleri için tty tabanlý görüntüleyici
 Group:		Utilities/System
 Group(pl):	Narzêdzia/System
-Prereq:		bash
-Requires:	%{name} = %{version}
 
 %description -n info
 The GNU project uses the texinfo file format for much of its documentation. 
@@ -88,6 +88,7 @@ bulunur.
 %patch4 -p1
 
 %build
+autoconf
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
 ./configure %{_target} \
 	--prefix=/usr \
@@ -105,20 +106,31 @@ make install prefix=$RPM_BUILD_ROOT/usr
 install util/fix-info-dir $RPM_BUILD_ROOT/sbin
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/info-dir
-ln -sf ../../etc/info-dir $RPM_BUILD_ROOT/usr/info/dir
+ln -sf ../../../etc/info-dir $RPM_BUILD_ROOT/usr/share/info/dir
 
 mv -f $RPM_BUILD_ROOT/usr/bin/install-info $RPM_BUILD_ROOT/sbin
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/wmconfig/info
 
-gzip -9nf $RPM_BUILD_ROOT/usr/info/*info* \
+gzip -9nf $RPM_BUILD_ROOT/usr/share/info/*info* \
 	ChangeLog INTRODUCTION NEWS README info/README
 %post
 /sbin/install-info /usr/info/texinfo.gz /etc/info-dir
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/install-info --delete /usr/info/texinfo.gz /etc/info-dir
+	/sbin/install-info --delete /usr/share/info/texinfo.gz /etc/info-dir
+fi
+
+%pre -n info
+if [ -e /usr/info ] && [ ! -L /usr/info ]; then
+	mv -f /usr/info/* /usr/share/info
+fi
+
+%post -n info
+if [ -e /usr/info ] && [ ! -L /usr/info ]; then
+	rm -rf /usr/info/
+	ln -sf /usr/share/info /usr/info
 fi
 
 %clean
@@ -128,25 +140,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc {ChangeLog,INTRODUCTION,NEWS,README,info/README}.gz
 %attr(755,root,root) /usr/bin/*
-/usr/info/info-stnd.info*
-/usr/info/texinfo*
-%lang(cs)    /usr/share/locale/cs/LC_MESSAGES/texinfo.mo
-%lang(de)    /usr/share/locale/de/LC_MESSAGES/texinfo.mo
-%lang(de_AT) /usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo
-%lang(fr)    /usr/share/locale/fr/LC_MESSAGES/texinfo.mo
-%lang(nl)    /usr/share/locale/nl/LC_MESSAGES/texinfo.mo
-%lang(no)    /usr/share/locale/no/LC_MESSAGES/texinfo.mo
-%lang(ru)    /usr/share/locale/ru/LC_MESSAGES/texinfo.mo
+/usr/share/info/info-stnd.info*
+/usr/share/info/texinfo*
 
 %files -n info
 %defattr(644,root,root,755)
 %config(missingok) /etc/X11/wmconfig/info
 %config(noreplace) %verify(not mtime size md5) /etc/info-dir
-%config /usr/info/dir
+%config /usr/share/info/dir
 %attr(755,root,root) /usr/bin/info
-/usr/info/info.info*
+/usr/share/info/info.info*
 %attr(755,root,root) /sbin/install-info
 %attr(755,root,root) /sbin/fix-info-dir
+%lang(cs)    /usr/share/locale/cs/LC_MESSAGES/texinfo.mo
+%lang(de)    /usr/share/locale/de/LC_MESSAGES/texinfo.mo
+%lang(de_AT) /usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo
+%lang(fr)    /usr/share/locale/fr/LC_MESSAGES/texinfo.mo
+%lang(nl)    /usr/share/locale/nl/LC_MESSAGES/texinfo.mo
+%lang(no)    /usr/share/locale/no/LC_MESSAGES/texinfo.mo
+%lang(ru)    /usr/share/locale/ru/LC_MESSAGES/texinfo.mo
 
 %changelog
 * Thu Apr  1 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>