- cleanups, mainly in preambles

[packages/pnm2ppa.git] / pnm2ppa.spec

diff --git a/pnm2ppa.spec b/pnm2ppa.spec
index 55729872d0b47f2b718fcfc03192d61500aeb35a..1273a9821b8df7b7f7b153a18d2fdf76db74e482 100644 (file)
--- a/pnm2ppa.spec
+++ b/pnm2ppa.spec
@@ -1,4 +1,3 @@
-#%define               _pre    pre3
 Summary:       Drivers for printing to HP PPA printers
 Summary(pl):   Sterowniki do drukarek HP PPA
 Name:          pnm2ppa
@@ -6,7 +5,7 @@ Version:        1.12
 Release:       1
 License:       GPL
 Group:         Applications/Publishing
-Source0:       http://belnet.dl.sourceforge.net/pnm2ppa/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Source0-md5: effd8c42bbe7c970e70fa7d9d991275b
 Source1:       ppa-0.8.6.tar.gz
 # Source1-md5: fb40576435d5979db64fbea305ec224b
@@ -16,10 +15,11 @@ Patch0:             pbm2ppa-20000205.diff
 Patch1:                %{name}-pld.patch
 Patch2:                %{name}-destdir.patch
 URL:           http://pnm2ppa.sourceforge.net/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Requires:      mpage ghostscript
+Requires:      ghostscript
+Requires:      mpage
 Obsoletes:     ppa
 Obsoletes:     pbm2ppa
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 pnm2ppa is a color driver for HP PPA host-based printers such as the
@@ -42,15 +42,15 @@ sterownika o nazwie pbm2ppa.
 Wiêcej informacji znajduje siê na stronie projektu.
 
 %prep
-%setup -q -n %{name}-%{version} -a1 -a2
+%setup -q -a1 -a2
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
 
 %build
 %{__make}
-cd pbm2ppa-0.8.6
-%{__make}
+
+%{__make} -C pbm2ppa-0.8.6
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,5 +92,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/detect_ppa
 %{_mandir}/man1/*.1*
 %attr(755,root,root) %{_libdir}/lpfilters/pnm2ppa-filter-*
-%config %{_sysconfdir}/pnm2ppa.conf
-%config %{_sysconfdir}/pbm2ppa.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pnm2ppa.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pbm2ppa.conf