[foomatic] foomatic-rip's upstream moved from foomatic-filters to cups-filters-1.0.42

[Jiří Popelka]

commit 7ceea0f262bd8b96c6f173a1e193b902804012ad
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Sat Nov 30 19:45:03 2013 +0100

    foomatic-rip's upstream moved from foomatic-filters to cups-filters-1.0.42

 foomatic-filters-debug-string.patch |   12 -----
 foomatic.spec                       |   86 +++++------------------------------
 sources                             |    1 -
 3 files changed, 12 insertions(+), 87 deletions(-)
---
diff --git a/foomatic.spec b/foomatic.spec
index 9797438..dd4d99f 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,10 +1,7 @@
-%global enginever 4.0.9
-%global filtersver 4.0.17
-
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
-Version:    %{enginever}
-Release:    7%{?dist}
+Version:    4.0.9
+Release:    8%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -13,15 +10,7 @@ Obsoletes: printer-filters < 1.1-8
 Provides: printer-filters = 1.1-8
 
 # The database engine.
-Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
-
-# The CUPS driver and filter.
-# Source1: http://www.openprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
-# We need to remove test/*.sh, because those files are non-free (Artistic). We don't use them.
-Source1: foomatic-filters-%{filtersver}-clean.tar.gz
-
-## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
-Patch1: foomatic-filters-debug-string.patch
+Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{version}.tar.gz
 
 ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
@@ -35,15 +24,12 @@ BuildRequires:  autoconf, automake
 BuildRequires:  cups-devel
 BuildRequires:  dbus-devel
 Requires:       dbus
-Requires:       %{name}-filters = %{version}-%{release}
+Requires:       cups-filters >= 1.0.42
 Requires:       perl >= 3:5.8.1
 Requires:       %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
 # For 'rm' and '/sbin/service' in post
 Requires: fileutils initscripts
 
-# foomatic-filters checks for a conversion utility (bug #124931).
-BuildRequires: mpage
-
 # Make sure we get postscriptdriver tags.  Safe to comment out when
 # bootstrapping a new architecture.
 BuildRequires: python-cups, cups
@@ -71,31 +57,10 @@ queues (foomatic-configure) and to print files/manipulate jobs
 
 The site http://www.linuxprinting.org/ is based on this database.
 
-%package filters
-Summary: CUPS print filters for the foomatic package
-License: GPLv2+
-Group: System Environment/Libraries
-
-%description filters
-CUPS print filters for the foomatic package.
-
 %prep
-%setup -q -c -a 1
-
-pushd foomatic-filters-%{filtersver}
-# Too few arguments for format in a debugging string (bug #726384)
-%patch1 -p1 -b .debug-string
-
-aclocal
-automake --add-missing
-autoconf
-popd
+%setup -q -n foomatic-db-engine-%{version}
 
-pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
-aclocal
-autoconf
-popd
 
 %build
 export LIB_CUPS=%{_cups_serverbin}
@@ -103,34 +68,18 @@ export CUPS_BACKENDS=%{_cups_serverbin}/backend
 export CUPS_FILTERS=%{_cups_serverbin}/filter
 export CUPS_PPDS=%{_datadir}/cups/model
 
-pushd foomatic-filters-%{filtersver}
-%configure
-make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
-popd
-
-pushd foomatic-db-engine-%{enginever}
+aclocal
+autoconf
 %configure --disable-xmltest
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
-popd
 
 %install
-pushd foomatic-filters-%{filtersver}
-mkdir -p %{buildroot}%{perl_vendorlib}
-make    DESTDIR=%buildroot PREFIX=%{_prefix} \
-        INSTALLSITELIB=%{perl_vendorlib} \
-        INSTALLSITEARCH=%{perl_vendorarch} \
-        install-main install-cups
-popd
-
-pushd foomatic-db-engine-%{enginever}
 make    DESTDIR=%buildroot PREFIX=%{_prefix} \
         INSTALLSITELIB=%{perl_vendorlib} \
         INSTALLSITEARCH=%{perl_vendorarch} \
         install
-popd
 
-# Use relative, not absolute, symlink for CUPS filter and driver.
-ln -sf ../../../bin/foomatic-rip %{buildroot}%{_cups_serverbin}/filter/foomatic-rip
+# Use relative, not absolute, symlink for CUPS driver.
 ln -sf ../../../bin/foomatic-ppdfile %{buildroot}%{_cups_serverbin}/driver/foomatic
 
 mkdir -p %{buildroot}%{_var}/cache/foomatic
@@ -145,18 +94,13 @@ rm -rf  \
 #%{buildroot}%%{_libdir}/perl5/site_perl
 find %{buildroot} -name .packlist | xargs rm -f
 
-mkdir  _enginedocs
-cp -pr --parents foomatic-db-engine-%{enginever}/COPYING _enginedocs/
-mkdir _filtersdocs
-cp -pr --parents foomatic-filters-%{filtersver}/COPYING _filtersdocs/
-
 %post
 /bin/rm -f /var/cache/foomatic/*
 exit 0
 
 
 %files
-%doc _enginedocs/*
+%doc COPYING
 %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
 %{_bindir}/foomatic-combo-xml
 %{_bindir}/foomatic-compiledb
@@ -170,7 +114,6 @@ exit 0
 %{_bindir}/foomatic-searchprinter
 %{_sbindir}/*
 %{perl_vendorlib}/Foomatic
-%{_cups_serverbin}/backend/beh
 %{_cups_serverbin}/driver/*
 %{_mandir}/man1/foomatic-combo-xml.1*
 %{_mandir}/man1/foomatic-compiledb.1*
@@ -182,15 +125,10 @@ exit 0
 %{_mandir}/man8/*
 %{_var}/cache/foomatic
 
-%files filters
-%doc _filtersdocs/*
-%dir %{_sysconfdir}/foomatic
-%config(noreplace) %{_sysconfdir}/foomatic/filter.conf
-%{_bindir}/foomatic-rip
-%{_cups_serverbin}/filter/foomatic-rip
-%{_mandir}/man1/foomatic-rip.1*
-
 %changelog
+* Sat Nov 30 2013 Jiri Popelka <jpopelka at redhat.com> - 4.0.9-8
+- foomatic-rip's upstream moved from foomatic-filters to cups-filters-1.0.42
+
 * Thu Nov 28 2013 Jiri Popelka <jpopelka at redhat.com> - 4.0.9-7
 - Correct Obsoletes/Provides printer-filters (bug #1035450)
 
diff --git a/sources b/sources
index 46d62d6..ed5e5ed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 5b33c1adb21e7b6f3652e9a18d0e6f4e  foomatic-db-engine-4.0.9.tar.gz
-381744b6bbd91bc5e8a2689a8d541965  foomatic-filters-4.0.17-clean.tar.gz