- release 18

[packages/a2ps.git] / a2ps.spec

diff --git a/a2ps.spec b/a2ps.spec
index c70a3325edebff7ec6d62afafa473caa6165c377..3b7bc3a28eacdc94bc3097b65b9e54461d4f8e48 100644 (file)
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -2,7 +2,7 @@ Summary:        Text to Postscript filter
 Summary(pl):   Filtr text/plain do  Postscriptu
 Name:          a2ps
 Version:       4.13b
-Release:       15
+Release:       18
 License:       GPL
 Group:         Applications/Text
 Group(de):     Applikationen/Text
@@ -11,7 +11,7 @@ Group(pl):    Aplikacje/Tekst
 Source0:       ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz
 Source1:       ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-security.patch
+#Patch1:               %{name}-security.patch
 Patch2:                %{name}-etc.patch
 Patch3:                %{name}-flex.patch
 Patch4:                %{name}-conf.patch
@@ -19,6 +19,7 @@ Patch5:               %{name}-glibcpaper.patch
 Patch6:                %{name}-autoenc.patch
 Patch7:                %{name}-i18n.patch
 URL:           http://www.inf.enst.fr/~demaille/a2ps/
+BuildRequires: flex
 Prereq:                /sbin/ldconfig
 Requires:      psutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -78,7 +79,7 @@ Biblioteki statyczne do a2ps.
 %prep
 %setup  -q -n %{name}-4.13 -a 1
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -87,7 +88,7 @@ Biblioteki statyczne do a2ps.
 %patch7 -p1
 
 %build
-%configure \
+%configure2_13 \
        --with-gnu-gettext \
        --with-medium=_glibc  \
        --with-encoding=latin1 \
@@ -97,7 +98,7 @@ Biblioteki statyczne do a2ps.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/a2ps/{afm,fonts}
+install -d $RPM_BUILD_ROOT%{_datadir}/a2ps/{afm,fonts}
 
 perl -pe 's/^lispdir = $/lispdir = \$(prefix)\/lib\/emacs\/site-lisp/g' contrib/emacs/Makefile >tmp
 
@@ -107,8 +108,8 @@ mv -f tmp contrib/emacs/Makefile
 
 gzip -9nf AUTHORS ChangeLog NEWS README THANKS
 
-install i18n-fonts-0.1/afm/*.afm %{buildroot}/usr/share/a2ps/afm
-install i18n-fonts-0.1/fonts/*.pfb %{buildroot}/usr/share/a2ps/fonts
+install i18n-fonts-0.1/afm/*.afm %{buildroot}%{_datadir}/a2ps/afm
+install i18n-fonts-0.1/fonts/*.pfb %{buildroot}%{_datadir}/a2ps/fonts
 
 %find_lang %{name}