From 9d9af17f9e89d10845d656b7aab21e91181ad009 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Nov 28 2013 08:27:11 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/foomatic.spec b/foomatic.spec
index 2c0ee81..9797438 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -4,13 +4,13 @@
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    3%{?dist}
+Release:    7%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
-# printer-filters package has gone (bug #967316).
-Obsoletes: printer-filters < printer-filters-1.1-8
-Provides: printer-filters = printer-filters-1.1-8
+# printer-filters package has gone (bug #967316, bug #1035450).
+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
@@ -191,6 +191,18 @@ exit 0
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Thu Nov 28 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0.9-7
+- Correct Obsoletes/Provides printer-filters (bug #1035450)
+
+* Wed Aug 14 2013 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.9-6
+- Perl 5.18 re-rebuild of bootstrapped packages
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 4.0.9-4
+- Perl 5.18 rebuild
+
 * Mon Jun  3 2013 Tim Waugh <twaugh@redhat.com> - 4.0.9-3
 - Obsolete/provide printer-filters package now it has gone (bug #967316).