X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffoomatic-filters.git;a=blobdiff_plain;f=foomatic-filters.spec;h=72c638d1d5fef60a555fcb83feeecd9115c8af6f;hp=47bf25724643ac5ef6dacdf5d44430e2e54a2d12;hb=HEAD;hpb=e80a98b280d850760017ffa49412e2cf7a74e4dc

diff --git a/foomatic-filters.spec b/foomatic-filters.spec
index 47bf257..ce4bc57 100644
--- a/foomatic-filters.spec
+++ b/foomatic-filters.spec
@@ -1,22 +1,21 @@
 #
+# Conditional build:
 %bcond_with	ppr	# ppr support disabled until we have ppr.spec in working shape
 #
-%include	/usr/lib/rpm/macros.perl
-%define		snap	20080317
 Summary:	System for using free software printer drivers
 Summary(pl.UTF-8):	System umożliwiający używanie darmowych sterowników drukarek
 Name:		foomatic-filters
-Version:	3.0.%{snap}
+Version:	4.0.17
 Release:	1
 Epoch:		1
-License:	GPL
+License:	GPL v2+
 Group:		Applications/System
-Source0:	http://www.linuxprinting.org/download/foomatic/%{name}-3.0-%{snap}.tar.gz
-# Source0-md5:	7a39b08e1a8b1b63917277a021d403eb
-URL:		http://www.linuxprinting.org/foomatic.html
-BuildRequires:	a2ps
-BuildRequires:	autoconf
+Source0:	http://www.openprinting.org/download/foomatic/%{name}-%{version}.tar.gz
+# Source0-md5:	b05f5dcbfe359f198eef3df5b283d896
+URL:		http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
+BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
+BuildRequires:	dbus-devel
 BuildRequires:	rpm-perlprov
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,44 +34,14 @@ PDQ, CUPS, VA Linux LPD, LPRng, PPR i bezpośrednie drukowanie bez
 kolejkowania oraz dowolny wolnodostępny sterownik, dla którego
 parametry zostały wprowadzone do bazy danych.
 
-%package gswrapper
-Summary:	foomatic wrapper for ghostscript
-Summary(pl.UTF-8):	wrapper dla ghostscripta do użycia z foomatic
-Group:		Applications/System
-Requires:	a2ps
-Requires:	ghostscript
-Obsoletes:	foomatic-gswrapper
-
-%description gswrapper
-A little Ghostscript regularization script. It massages arguments to
-make Ghostscript execute properly as a filter, with output on stdout
-and errors etc on stderr.
-
-NOTE: This script is needed in a few situations only and may not work
-with some Ghostscript versions. Moreover in some situations his
-presence in the system may have effect that Your printer will not
-print. So - Do not install this package if You don't know what You're
-doing.
-
-%description gswrapper -l pl.UTF-8
-Mały skrypt uzdatniający Ghostscripta. Obrabia parametry tak, żeby
-Ghostscript działał właściwie jako filtr, generując dane wyjściowe na
-stdout, a błędy na stderr.
-
-UWAGA: Ten skrypt jest potrzebny tylko w kilku przypadkach i może nie
-działac z niektórymi wersjami Ghostscripta. Ponadto w niektórych
-sytuacjach jego obecność w systemie może spowodować, że drukarka nie
-będzie drukowała. Tak więc - nie instaluj tego pakietu, jeśli nie
-wiesz, co robisz.
-
 %package -n cups-filter-foomatic
 Summary:	cupsomatic - CUPS filter
 Summary(pl.UTF-8):	cupsomatic - filtr do CUPS
 Group:		Applications/System
 Requires:	%{name} = %{epoch}:%{version}
 Requires:	cups
-Obsoletes:	foomatic-cups
 Obsoletes:	cups-foomatic
+Obsoletes:	foomatic-cups
 
 %description -n cups-filter-foomatic
 Cupsomatic is intended to be used as a CUPS filter for printers
@@ -102,12 +71,15 @@ ppromatic jest interfejsem do PPR dla drukarek zdefiniowanych w pliku
 PPD (PPD-O-Matic) uzyskanym z Linux Printing Database.
 
 %prep
-%setup -q -n %{name}-3.0-%{snap}
+%setup -q
 
 %build
 %{__aclocal}
 %{__autoconf}
-%configure
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-file-converter-check
 %{__make}
 
 %install
@@ -117,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 ln -sf %{_bindir}/foomatic-rip $RPM_BUILD_ROOT%{_ulibdir}/cups/filter/cupsomatic
 
+%if %{without ppr}
+%{__rm} -r $RPM_BUILD_ROOT%{_ulibdir}/ppr
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,17 +103,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/foomatic/direct
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/foomatic/filter.conf
 %attr(755,root,root) %{_bindir}/foomatic-rip
-%{_mandir}/man1/foomatic-rip*
-
-%files gswrapper
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/foomatic-gswrapper
-%{_mandir}/man1/foomatic-gswrapper*
+%{_mandir}/man1/foomatic-rip.1*
 
 %files -n cups-filter-foomatic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_ulibdir}/cups/backend/beh
-%attr(755,root,root) %{_ulibdir}/cups/filter/*
+%attr(755,root,root) %{_ulibdir}/cups/filter/cupsomatic
+%attr(755,root,root) %{_ulibdir}/cups/filter/foomatic-rip
 
 %if %{with ppr}
 %files ppr