diff --git a/a2ps.spec b/a2ps.spec index f432ae7..3f8a47d 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -1,4 +1,4 @@ -Summary: Converts text and other types of files to PostScript(TM). +Summary: Converts text and other types of files to PostScript(TM) Name: a2ps Version: 4.13b Release: 60%{?dist} @@ -44,14 +44,13 @@ BuildRequires: ImageMagick BuildRequires: groff-perl BuildRequires: cups Url: http://www.inf.enst.fr/~demaille/a2ps/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: psutils -PreReq: sed, coreutils -Obsoletes: a2ps-i18n -Provides: a2ps-i18n - -# Temp exclude on ppc64 as no emacs there right now -ExcludeArch: ppc64 +Requires(post): coreutils +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +Obsoletes: a2ps-i18n <= 0.1-1 +Provides: a2ps-i18n = 0.1-1 BuildRequires: gettext @@ -173,17 +172,17 @@ find src lib -name '*.l' -exec touch {} \; /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c -- ) -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/a2ps/{afm,fonts} pushd i18n-fonts-0.1/afm -install -m 0644 *.afm %{buildroot}%{_datadir}/a2ps/afm +install -p -m 0644 *.afm %{buildroot}%{_datadir}/a2ps/afm pushd ../fonts -install -m 0644 *.pfb %{buildroot}%{_datadir}/a2ps/fonts +install -p -m 0644 *.pfb %{buildroot}%{_datadir}/a2ps/fonts popd popd @@ -192,30 +191,30 @@ inst() { mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/ for f in contrib/emacs/*.el; do \ - install -m 0644 $f %{buildroot}%{_datadir}/emacs/site-lisp/ ; done + install -p -m 0644 $f %{buildroot}%{_datadir}/emacs/site-lisp/ ; done } # Don't ship the library file or header (bug #203536). -rm -f $RPM_BUILD_ROOT%{_libdir}/* -rm -f $RPM_BUILD_ROOT%{_includedir}/* +rm -f %{buildroot}%{_libdir}/* +rm -f %{buildroot}%{_includedir}/* -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -gzip $RPM_BUILD_ROOT%{_infodir}/* || : +rm -f %{buildroot}%{_infodir}/dir +gzip %{buildroot}%{_infodir}/* || : %find_lang %name %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/a2ps.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/ogonkify.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/regex.info.gz %{_infodir}/dir (cd %{_datadir}/a2ps/afm; - ./make_fonts_map.sh > /dev/null 2>&1 || /bin/true - if [ -f fonts.map.new ]; then - mv fonts.map.new fonts.map - fi + ./make_fonts_map.sh > /dev/null 2>&1 || /bin/true + if [ -f fonts.map.new ]; then + mv fonts.map.new fonts.map + fi ) exit 0 @@ -252,7 +251,19 @@ exit 0 %dir %{_datadir}/a2ps %changelog -* Tue Feb 27 2007 Tim Waugh +* Wed Feb 28 2007 Tim Waugh +- Preserve timestamps (bug #225235). +- Use smp_mflags (bug #225235). +- Requires install-info for post and preun scriptlets (bug #225235). +- Avoid tabs (bug #225235). +- Explicity versioning for obsoletes/provides (bug #225235). +- PreReq->Requires(post) (bug #225235). +- Fixed macros in changelog (bug #225235). +- Fixed summary (bug #225235). +- Converted spec file to UTF-8 (bug #225235). +- Fixed build root (bug #225235). +- Remove ExcludeArch (bug #225235). +- Use buildroot macro consistently (bug #225235). - Don't ship the library file or header (bug #203536). * Tue Jan 23 2007 Tim Waugh 4.13b-60 @@ -449,7 +460,7 @@ exit 0 - replace macros (%%makeinstall, %%configure) with traditional commands to avoid some troubles those macros caused. -* Tue Feb 20 2001 Trond Eivind Glomsr�d +* Tue Feb 20 2001 Trond Eivind Glomsrød - Using letter is as weird as oz, fl. oz, Fahrenheit, lb etc. Add a patch for using the glibc media type for giving US letter for en_US (only locale with this paper), and A4 @@ -458,7 +469,7 @@ exit 0 * Tue Feb 20 2001 Tim Powers - changed default medium back to letter (bug 27794) -* Mon Feb 19 2001 Trond Eivind Glomsr�d +* Mon Feb 19 2001 Trond Eivind Glomsrød - langify - use %%{_tmppath} @@ -470,7 +481,7 @@ exit 0 - %%post script requires fileutils (mv) and sh-utils (true). This should fix bug #24251). -* Mon Jan 08 2001 Trond Eivind Glomsr�d +* Mon Jan 08 2001 Trond Eivind Glomsrød - Add /usr/bin/emacs to BuildRequires - A4 - specify use of GNU Emacs for building @@ -523,9 +534,9 @@ exit 0 * Mon Jan 24 2000 Tim Powers - had to be more specific since the i18n stuff was removed from the package. - There is a new a2ps-i18n package which treats the - /usr/share/a2ps/afm/fonts.map file as a config file - + There is a new a2ps-i18n package which treats the + /usr/share/a2ps/afm/fonts.map file as a config file + * Wed Oct 27 1999 Tim Powers - added the --with-medium=Letter option to the configure process @@ -543,7 +554,7 @@ exit 0 - update to 4.12 for Powertools 6.0 * Sat Oct 24 1998 Jeff Johnson -- narrower range of %files splats. +- narrower range of %%files splats. - install info correctly. - new description/summary text.