- moved running of /usr/sbin/fix-info-dir to %%postun

[packages/flex.git] / flex.spec

diff --git a/flex.spec b/flex.spec
index a916685fb907f3505de9faf7c4916ce65b0a2ba2..1d49f9109d99646ab7c890c87f005d8e429af2ba 100644 (file)
--- a/flex.spec
+++ b/flex.spec
@@ -1,16 +1,19 @@
-Summary:     GNU fast lexical analyzer generator
-Summary(de): GNU - schneller lexikalischer Analysegenerator 
-Summary(fr): Générateur rapide d'analyseur lexical de GNU
-Summary(pl): GNU szybki generator analizatora sk³adni (flex)
-Summary(tr): GNU sözdizim çözümleyici
-Name:        flex
-Version:     2.5.4a
-Release:     7
-Copyright:   GPL
-Group:       Development/Tools
-Source:      ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
-Patch0:      flex-info.patch
-Buildroot:   /tmp/%{name}-%{version}-root
+Summary:       GNU fast lexical analyzer generator
+Summary(de):   GNU - schneller lexikalischer Analysegenerator 
+Summary(fr):   Générateur rapide d'analyseur lexical de GNU
+Summary(pl):   GNU szybki generator analizatora sk³adni (flex)
+Summary(tr):   GNU sözdizim çözümleyici
+Name:          flex
+Version:       2.5.4a
+Release:       12
+Copyright:     GPL
+Group:         Development/Tools
+Group(pl):     Programowanie/Narzêdzia
+Source:                ftp://prep.ai.mit.edu/pub/gnu/flex/%{name}-%{version}.tar.gz
+Patch0:                flex-info.patch
+Patch1:                flex-skel.patch
+Prereq:                /usr/sbin/fix-info-dir
+Buildroot:     /tmp/%{name}-%{version}-root
 
 %description
 This is the GNU fast lexical analyzer generator. It generates lexical
@@ -34,7 +37,7 @@ faisant partie de leur phase de construction.
 %description -l pl
 GNU flex s³u¿y do tworzenia programu analizy leksykalnej na podstawie
 wyra¿eñ regularnych i dyrektyw C zawartych w jednym lub wiêcej plikach
-wej¶ciowych.  Przeznaczony do wspó³pracy z parserami yacc i bison, jest
+wej¶ciowych. Przeznaczony do wspó³pracy z parserami yacc i bison, jest
 u¿ywany przez wiele programów w procesie kompilacji.
 
 %description -l tr
@@ -45,78 +48,48 @@ a
 
 %prep
 %setup -q -n %{name}-2.5.4
-%patch0 -p1
+%patch -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-       --prefix=/usr
+autoconf
+LDFLAGS="-s"; export LDFLAGS
+%configure
 make
 
 makeinfo MISC/texinfo/flex.texi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{bin,info,include,man/man1}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_infodir},%{_includedir},%{_mandir}/man1}
 
-install flex.info* $RPM_BUILD_ROOT/usr/info
+install flex.info* $RPM_BUILD_ROOT%{_infodir}
 
-make prefix=$RPM_BUILD_ROOT/usr install
-cd $RPM_BUILD_ROOT/usr/bin
-ln -sf flex lex
+make install prefix=$RPM_BUILD_ROOT%{_prefix} \
+       bindir=$RPM_BUILD_ROOT/%{_bindir} \
+       mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 \
+       libdir=$RPM_BUILD_ROOT/%{_libdir} \
+       includedir=$RPM_BUILD_ROOT/%{_includedir} \
+       infodir=$RPM_BUILD_ROOT/%{_infodir}
 
-gzip -9nf $RPM_BUILD_ROOT/usr/{info/*,man/man1/*}
+ln -sf flex $RPM_BUILD_ROOT%{_bindir}/lex
+
+gzip -9nf $RPM_BUILD_ROOT{%{_infodir}/*,%{_mandir}/man1/*} \
+       NEWS README
 
 %post
-/sbin/install-info /usr/info/flex.info.gz /etc/info-dir
+/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%preun
-if [ $1 = 0 ]; then
-        /sbin/install-info --delete /usr/info/flex.info.gz /etc/info-dir
-fi
+%postun
+/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644, root, root, 755)
-%doc NEWS README
-%attr(755, root, root) /usr/bin/*
-%attr(644, root,  man) /usr/man/man1/*
-/usr/info/flex*
-/usr/lib/*.a
-/usr/include/*.h
-
-%changelog
-* Tue Dec 29 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.5.4a-7]
-- added flex info pages and %post, %postun and
-  {un}registering info pages.
-
-* Mon Dec 28 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.5.4a-6]
-- added gzipping man pages,
-- LDFLAGS="-s" moved to make parameters.
-
-* Fri Sep 18 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.5.4a-5]
-- removed COPYING from %doc (copyright statment is in Copyright field),
-
-* Sun Jun 14 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-  [2.5.4a-5]
-- added buildroot support,
-- build from non root's account,
-- minor modifications of spec file,
-- added pl translation (made by Piotr Dembiñski <hektor@kki.net.pl>).
-
-* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
-- translations modified for de, fr, tr
-
-* Thu Oct 23 1997 Donnie Barnes <djb@redhat.com>
-- updated from 2.5.4 to 2.5.4a
-
-* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
-- built against glibc
-
-* Thu Mar 20 1997 Michael Fulbright <msf@redhat.com>
- Updated to v. 2.5.4
+%defattr(644,root,root,755)
+%doc {NEWS,README}.gz
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*
+%{_infodir}/flex*
+%{_libdir}/*.a
+%{_includedir}/*.h