[foomatic/f14] 4.0.8 (all patches merged upstream)

[Jiří Popelka]

commit 393874658b2be6a85e76bbf84b9ed65a4cae7157
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 25 13:33:49 2011 +0200

    4.0.8 (all patches merged upstream)

 .gitignore                           |    2 +
 foomatic-bad-utf8.patch              |   24 ----
 foomatic-db-engine-libdir.patch      |   33 ------
 foomatic-db-engine-perl.patch        |   39 -------
 foomatic-filters-CVE-2011-2697.patch |  209 ----------------------------------
 foomatic-filters-libdir.patch        |   12 --
 foomatic-mkstemp.patch               |   20 ----
 foomatic.spec                        |   36 ++----
 sources                              |    4 +-
 9 files changed, 14 insertions(+), 365 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91cc938..c50cb10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /foomatic-filters-4.0.6.tar.gz
 /foomatic-db-engine-4.0.7.tar.gz
 /foomatic-filters-4.0.7.tar.gz
+/foomatic-db-engine-4.0.8.tar.gz
+/foomatic-filters-4.0.8.tar.gz
diff --git a/foomatic.spec b/foomatic.spec
index b8dfe0b..5c84715 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,10 +1,10 @@
-%define enginever 4.0.7
-%define filtersver 4.0.7
+%define enginever 4.0.8
+%define filtersver 4.0.8
 
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    2%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -16,24 +16,8 @@ Source1: http://www.openprinting.org/download/foomatic/foomatic-filters-%{filter
 
 ## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
 
-# Use libdir.
-Patch1: foomatic-filters-libdir.patch
-
-# Use mkstemp, not mktemp.
-Patch2: foomatic-mkstemp.patch
-
-# Fix improper sanitization of command line options (bug #721001,
-# CVE-2011-2697).
-Patch3: foomatic-filters-CVE-2011-2697.patch
-
 ## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
-# Use libdir.
-Patch101: foomatic-db-engine-libdir.patch
-
-# Handle non-UTF-8 encodings in imported PPD files.
-Patch102: foomatic-bad-utf8.patch
-
 ## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
 Url:            http://www.linuxprinting.org
@@ -42,7 +26,9 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  libxml2-devel
 BuildRequires:  autoconf, automake
 BuildRequires:  cups
-Requires:	%{name}-filters = %{version}-%{release}
+BuildRequires:  dbus-devel
+Requires:       dbus
+Requires:       %{name}-filters = %{version}-%{release}
 Requires:       perl >= 3:5.8.1
 Requires:       %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -87,18 +73,13 @@ CUPS print filters for the foomatic package.
 %setup -q -c -a 1
 
 pushd foomatic-filters-%{filtersver}
-%patch1 -p1 -b .libdir
-%patch2 -p1 -b .mkstemp
-%patch3 -p1 -b .CVE-2011-2697
 aclocal
-automake
+automake --add-missing
 autoconf
 popd
 
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
-%patch101 -p1 -b .libdir
-%patch102 -p1
 aclocal
 autoconf
 popd
@@ -198,6 +179,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Mon Jul 25 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-1
+- 4.0.8 (all patches merged upstream)
+
 * Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-2
 - Fix improper sanitization of command line options (bug #721001,
   CVE-2011-2697).
diff --git a/sources b/sources
index f0adeae..6b3f200 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fcfa8eb9ce5494b81b58ae983fc2aeb5  foomatic-db-engine-4.0.7.tar.gz
-20abd25c1c98b2dae68709062a132a7d  foomatic-filters-4.0.7.tar.gz
+5283cd5125a96dc0b35d896326512b1a  foomatic-db-engine-4.0.8.tar.gz
+752324ef037fbb0de18190aa26ceab7d  foomatic-filters-4.0.8.tar.gz