- release 2,

[packages/a2ps.git] / a2ps.spec

diff --git a/a2ps.spec b/a2ps.spec
index 164f383822dc145d3187c206f70946ccd8bf2e9c..d1da8044a25f0aede9237290b952b0aee14fe0ba 100644 (file)
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -2,16 +2,17 @@ Summary:      Text to Postscript filter.
 Summary(pl):   Filtr text/plain do  Postscriptu
 Name:          a2ps
 Version:       4.12
-Release:       1
+Release:       2
 Copyright:     GPL
 Group:         Utilities/Text
 Group(pl):     Narzêdzia/Tekst
 Source:                ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz
 Patch:         a2ps-info.patch
-Prereq:                /sbin/ldconfig
 URL:           http://www.inf.enst.fr/~demaille/a2ps/
 BuildRoot:     /tmp/%{name}-%{version}-root
 
+%define                _sysconfdir     /etc
+
 %description
 a2ps is a text to PostScript filter with pretty-printing capabilities.
 It includes support for a wide number of programming languages,
@@ -30,7 +31,7 @@ do innych program
 u¿yciu tego samego polecenia. Zawiera program ,,ogonkify'' poprawiaj±cy 
 b³êdnie zakodowany PostScript zawieraj±cy polskie znaki. 
 
-%package       devel
+%package devel
 Summary:       Header files and development documentation for a2ps
 Summary(pl):   Pliki nag³ówkowe i dokunentacja do a2ps
 Group:         Libraries
@@ -43,7 +44,7 @@ Header files and development documentation for a2ps.
 %description devel -l pl
 Pliki nag³ówkowe i dokumentacja do a2ps.
 
-%package       static
+%package static
 Summary:       a2ps static libraries
 Summary(pl):   Biblioteki statyczne do a2ps
 Group:         Libraries
@@ -61,27 +62,22 @@ Biblioteki statyczne do a2ps.
 %patch -p1
 
 %build
-autoheader
-autoconf
-CFLAGS=$RPM_OPT_FLAGS LDFLAGS=-s \
-./configure %{_target_platform} \
-       --with-included-gettext \
-       --prefix=/usr \
-       --sysconfdir=/etc \
+LDFLAGS="-s"; export LDFLAGS
+%configure \
+       --with-gnu-gettext \
        --with-medium=A4  \
        --with-encoding=latin1 \
-       --enable-shared
+       --disable-shared
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-perl -pe 's/^lispdir = $/lispdir = {prefix}\/lib/g' contrib/emacs/Makefile >tmp
+perl -pe 's/^lispdir = $/lispdir = \$(prefix)\/lib\/emacs\/site-lisp/g' contrib/emacs/Makefile >tmp
 
 mv tmp contrib/emacs/Makefile
-make prefix=$RPM_BUILD_ROOT/usr sysconfdir=$RPM_BUILD_ROOT/etc install
+make install DESTDIR=$RPM_BUILD_ROOT
 
-#chmod 755     $RPM_BUILD_ROOT%{_libdir}/*.so.*
 gzip -9nf $RPM_BUILD_ROOT%{_infodir}/* \
        $RPM_BUILD_ROOT%{_mandir}/man1/* \
        AUTHORS ChangeLog NEWS README THANKS
@@ -94,13 +90,12 @@ gzip -9nf $RPM_BUILD_ROOT%{_infodir}/* \
 /sbin/ldconfig
 
 %preun
-if [ $1 = 0 ]; then
+if [ "$1" = "0" ]; then
        /sbin/install-info --delete %{_infodir}/a2ps.info.gz /etc/info-dir
        /sbin/install-info --delete %{_infodir}/ogonkify.info.gz /etc/info-dir
 fi
 
-%postun 
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -109,7 +104,7 @@ fi
 %config(noreplace) %verify(not size mtime md5) /etc/a2ps.cfg
 
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*
+#%attr(755,root,root) %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_infodir}/a2ps*info*
 %{_infodir}/ogonkify*info*
@@ -119,35 +114,23 @@ fi
 %{_datadir}/a2ps/afm/*.map
 %attr(755,root,root) %{_datadir}/a2ps/afm/*.sh
 
-%dir %{_datadir}/a2ps/encoding
-%{_datadir}/a2ps/encoding/*
-
-%dir %{_datadir}/a2ps/fonts
-%{_datadir}/a2ps/fonts/*
-
-%dir %{_datadir}/a2ps/ogonkify
-%{_datadir}/a2ps/ogonkify/*.enc
-%{_datadir}/a2ps/ogonkify/*.ps
-
-%dir %{_datadir}/a2ps/ppd
-%{_datadir}/a2ps/ppd/*.ppd
+%{_datadir}/a2ps/encoding
+%{_datadir}/a2ps/fonts
+%{_datadir}/a2ps/ppd
+%{_datadir}/a2ps/ps
+%{_datadir}/a2ps/sheets
 
-%dir %{_datadir}/a2ps/ps
-%{_datadir}/a2ps/ps/*
-
-%dir %{_datadir}/a2ps/sheets
-%{_datadir}/a2ps/sheets/*
+%dir %{_datadir}/ogonkify
+%{_datadir}/ogonkify/*.enc
+%{_datadir}/ogonkify/*.ps
 
 %files devel
 %defattr(644,root,root,755)
-
-%attr(755,root,root) %{_libdir}/lib*.so
-
+#%attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/*
 
 %files static
 %defattr(644,root,root,755)
-
 %{_libdir}/lib*.a
 
 %clean