rpms/pnm2ppa/F-13 pnm2ppa.spec,1.15,1.16

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/pnm2ppa/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20870

Modified Files:
	pnm2ppa.spec 
Log Message:
* Fri Mar  5 2010 Tim Waugh <twaugh at redhat.com> - 1:1.04-19
- Consistent use of macros.
- Removed ancient obsoletes tag.
- Clean buildroot in install section not prep section.
- Make setup quiet.
- Use noreplace for config files.



Index: pnm2ppa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pnm2ppa/F-13/pnm2ppa.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- pnm2ppa.spec	26 Jul 2009 19:01:13 -0000	1.15
+++ pnm2ppa.spec	5 Mar 2010 16:50:21 -0000	1.16
@@ -1,13 +1,14 @@
 Name: pnm2ppa
 Summary: Drivers for printing to HP PPA printers
 Epoch: 1
-Obsoletes: ppa
 Version: 1.04
-Release: 18%{?dist}
+Release: 19%{?dist}
 URL: http://sourceforge.net/projects/pnm2ppa 
 Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
 Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
+# Upstream sync.
 Patch2: pbm2ppa-20000205.diff
+# Use RPM_OPT_FLAGS.
 Patch3: pnm2ppa-redhat.patch
 License: GPLv2
 Group: Applications/Publishing
@@ -23,12 +24,10 @@ printer in PPA format.
 Install pnm2ppa if you need to print to a PPA printer.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q -n %{topdir}
 
 #pbm2ppa source
-%setup -T -D -a 1 -n %{topdir}
+%setup -q -T -D -a 1 -n %{topdir}
 %patch2 -p0 -b .20000205
 %patch3 -p1 -b .rh
 
@@ -39,16 +38,17 @@ make
 
 
 %install
-install -d $RPM_BUILD_ROOT/usr/bin
-install -d $RPM_BUILD_ROOT/etc
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
-make INSTALLDIR=$RPM_BUILD_ROOT/usr/bin CONFDIR=$RPM_BUILD_ROOT/etc \
+make INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \
     MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install 
-install -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT/usr/bin/
-install -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT/usr/bin/
-install -m 0755 pbm2ppa-0.8.6/pbm2ppa  $RPM_BUILD_ROOT/usr/bin/
-install -m 0755 pbm2ppa-0.8.6/pbmtpg   $RPM_BUILD_ROOT/usr/bin/
-install -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf   $RPM_BUILD_ROOT/etc
+install -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 pbm2ppa-0.8.6/pbm2ppa  $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 pbm2ppa-0.8.6/pbmtpg   $RPM_BUILD_ROOT%{_bindir}
+install -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -m 0644 pbm2ppa-0.8.6/pbm2ppa.1   $RPM_BUILD_ROOT%{_mandir}/man1
 
 chmod 644 docs/en/LICENSE
@@ -68,18 +68,25 @@ rm -rf $RPM_BUILD_ROOT 
 %doc docs/en/INSTALL.REDHAT.html docs/en/COLOR.html docs/en/CALIBRATION.html
 %doc test.ps
 %doc pbm2ppa
-/usr/bin/pnm2ppa
-/usr/bin/pbm2ppa
-/usr/bin/pbmtpg
-/usr/bin/calibrate_ppa
-/usr/bin/test_ppa
-/usr/bin/detect_ppa
+%{_bindir}/pnm2ppa
+%{_bindir}/pbm2ppa
+%{_bindir}/pbmtpg
+%{_bindir}/calibrate_ppa
+%{_bindir}/test_ppa
+%{_bindir}/detect_ppa
 %{_mandir}/man1/pnm2ppa.1*
 %{_mandir}/man1/pbm2ppa.1*
-%config /etc/pnm2ppa.conf
-%config /etc/pbm2ppa.conf
+%config(noreplace) %{_sysconfdir}/pnm2ppa.conf
+%config(noreplace) %{_sysconfdir}/pbm2ppa.conf
 
 %changelog
+* Fri Mar  5 2010 Tim Waugh <twaugh at redhat.com> - 1:1.04-19
+- Consistent use of macros.
+- Removed ancient obsoletes tag.
+- Clean buildroot in install section not prep section.
+- Make setup quiet.
+- Use noreplace for config files.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.04-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild