- added version.texi.patch (to correct regenerate Makefile.in)

- added DESTDIR.patch (allow make install DESTDIR=...)
- fixed %post and %pre scripts
- removed /usr/bin/info from texinfo (is in info subpackage)
- removed %config from wmconfig file
- all binaries in /usr (in /sbin is symlink for back-compatibility)

Changed files:
    texinfo.spec -> 1.12

diff --git a/texinfo.spec b/texinfo.spec
index d382621b148082d725250421161b8b21fe157b80..ef3ea2d1dba60e434d4d1421c26c1cfb8634b84d 100644 (file)
--- 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.12h
-Release:       2
+Release:       3
 Copyright:     GPL
 Group:         Applications/Publishing
 Group(pl):     Aplikacje/Publikowanie
@@ -17,7 +17,8 @@ Patch1:               texinfo-fix.patch
 Patch2:                texinfo-alpha-tioc.patch
 Patch3:                texinfo-zlib.patch
 Patch4:                texinfo-info.patch
-BuildPrereq:   autoconf >= 1.13-8
+Patch5:                texinfo-version.texi.patch
+Patch6:                texinfo-DESTDIR.patch
 Prereq:                /sbin/install-info
 Requires:      info = %{version}
 Buildroot:     /tmp/%{name}-%{version}-root
@@ -86,29 +87,35 @@ bulunur.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
+ln -s version.texi doc/version2.texi
+automake
+gettextize --copy --force
+aclocal
 autoconf
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target_platform} \
-       --prefix=/usr \
+LDFLAGS="-s -lz"; export LDFLAGS
+%configure \
        --without-included-gettext
 make
 rm util/install-info
-make -C util LIBS=-lz
+make -C util 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,sbin}
+install -d $RPM_BUILD_ROOT{/etc/X11/wmconfig,%{_sbindir},/sbin}
 
-make install prefix=$RPM_BUILD_ROOT/usr
+make install DESTDIR=$RPM_BUILD_ROOT
 
-install util/fix-info-dir $RPM_BUILD_ROOT/sbin
+install util/fix-info-dir $RPM_BUILD_ROOT%{_sbindir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/info-dir
 ln -sf ../../../etc/info-dir $RPM_BUILD_ROOT%{_infodir}/dir
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
+mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}
+ln -s %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/wmconfig/info
 
@@ -126,14 +133,14 @@ if [ "$1" = "0" ]; then
 fi
 
 %pre -n info
-if [ -e %{_infodir} ] && [ ! -L /usr/info ]; then
-       mv -f %{_infodir}/* %{_infodir}
+if [ -e /usr/info ] && [ ! -L /usr/info ]; then
+       cp -af /usr/info %{_infodir} 
 fi
 
 %post -n info
-if [ -e %{_infodir} ] && [ ! -L /usr/info ]; then
-       rm -rf %{_infodir}/
-       ln -sf %{_infodir} %{_infodir}
+if [ -e /usr/info ] && [ ! -L /usr/info ]; then
+       rm -rf /usr/info
+       ln -sf %{_infodir} /usr/info
 fi
 
 %clean
@@ -142,19 +149,22 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {ChangeLog,INTRODUCTION,NEWS,README,info/README}.gz
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/makeinfo
+%attr(755,root,root) %{_bindir}/texi2dvi
+%attr(755,root,root) %{_bindir}/texindex
 %{_infodir}/info-stnd.info*
 %{_infodir}/texinfo*
 
 %files -n info -f texinfo.lang
 %defattr(644,root,root,755)
-%config(missingok) /etc/X11/wmconfig/info
+/etc/X11/wmconfig/info
 %config(noreplace) %verify(not mtime size md5) /etc/info-dir
 %config %{_infodir}/dir
 %attr(755,root,root) %{_bindir}/info
 %{_infodir}/info.info*
 %attr(755,root,root) /sbin/install-info
-%attr(755,root,root) /sbin/fix-info-dir
+%attr(755,root,root) %{_sbindir}/fix-info-dir
+%attr(755,root,root) %{_sbindir}/install-info
 
 %changelog
 * Sun Jun 06 1999 Jan Rêkorajski <baggins@pld.org.pl>