- updated to 1.12

[packages/pnm2ppa.git] / pnm2ppa.spec

diff --git a/pnm2ppa.spec b/pnm2ppa.spec
index f4b4fc27813ca95c73f5ce99695d327da41f4e37..868a3ddd87df1b9b5a667fbc2f0017a9a454f496 100644 (file)
--- a/pnm2ppa.spec
+++ b/pnm2ppa.spec
@@ -1,15 +1,17 @@
+#%define               _pre    pre3
 Summary:       Drivers for printing to HP PPA printers
 Summary(pl):   Sterowniki do drukarek HP PPA
 Name:          pnm2ppa
-Version:       1.04
+Version:       1.12
 Release:       1
 License:       GPL
 Group:         Applications/Publishing
-Source0:       http://download.sourceforge.net/pnm2ppa/%{name}-%{version}.tar.gz
+Source0:       http://belnet.dl.sourceforge.net/pnm2ppa/%{name}-%{version}.tar.gz
 Source1:       ppa-0.8.6.tar.gz
 Source2:       %{name}-filters.tar.gz
 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
@@ -37,9 +39,10 @@ sterownika o nazwie pbm2ppa.
 Wiêcej informacji znajduje siê na stronie projektu.
 
 %prep
-%setup -q -a1 -a2
+%setup -q -n %{name}-%{version} -a1 -a2
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}
@@ -50,9 +53,10 @@ cd pbm2ppa-0.8.6
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir},%{_mandir}/man1,%{_libdir}/lpfilters}
 
-%{__make} INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} \
+%{__make} install \
+       BINDIR=$RPM_BUILD_ROOT%{_bindir} \
        CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \
-       MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install
+       MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
 
 install utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir}
 install utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir}
@@ -66,20 +70,17 @@ install pnm2ppa-filters/pnm2ppa-filter-color $RPM_BUILD_ROOT%{_libdir}/lpfilters
 install pnm2ppa-filters/pnm2ppa-filter-color-eco $RPM_BUILD_ROOT%{_libdir}/lpfilters
 
 install -d pbm2ppa
-for file in CALIBRATION CREDITS INSTALL INSTALL-MORE LICENSE README ; do
-  install -m 0644 pbm2ppa-0.8.6/$file pbm2ppa/$file
-  gzip -9nf pbm2ppa/$file
+for file in CALIBRATION CREDITS README ; do
+       install -m 0644 pbm2ppa-0.8.6/$file pbm2ppa/$file
 done
 
-gzip -9nf docs/en/{CREDITS,INSTALL,LICENSE,README,RELEASE-NOTES,TODO,COLOR.txt,CALIBRATION.txt} \
-       test.ps
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/en/*.gz docs/en/*.html test.ps.gz pbm2ppa
+%doc docs/en/{CREDITS,INSTALL,LICENSE,README,RELEASE-NOTES,TODO,COLOR.txt,CALIBRATION.txt}
+%doc test.ps pbm2ppa
 %attr(755,root,root) %{_bindir}/pnm2ppa
 %attr(755,root,root) %{_bindir}/pbm2ppa
 %attr(755,root,root) %{_bindir}/pbmtpg
@@ -87,6 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/test_ppa
 %attr(755,root,root) %{_bindir}/detect_ppa
 %{_mandir}/man1/*.1*
-%{_libdir}/lpfilters/pnm2ppa-filter-*
+%attr(755,root,root) %{_libdir}/lpfilters/pnm2ppa-filter-*
 %config %{_sysconfdir}/pnm2ppa.conf
 %config %{_sysconfdir}/pbm2ppa.conf