From a5a0251a48ce8cf5ab6cf668bf7fb30d25ac39e1 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Oct 12 2007 08:54:13 +0000
Subject: - Removed use of printconf hooks.

- Don't restart CUPS on upgrade.

---

diff --git a/foomatic.spec b/foomatic.spec
index 5761ac3..17dd858 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    51%{?dist}
+Release:    52%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -66,9 +66,8 @@ BuildRequires: mpage
 Conflicts: ghostscript < 7.05
 Conflicts: hpijs < 1.5
 
-# Some XM files have a <drivers> tag which confuses the older printconf
-# parser.
-Conflicts: system-config-printer < 0.6.139
+# We don't use the printconf hooks now, so require that they are gone.
+Conflicts: system-config-printer < 0.7.0
 
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
@@ -228,19 +227,6 @@ find $RPM_BUILD_ROOT -name .packlist -o -name '*.xml.*' | xargs rm -f
 
 %post
 /bin/rm -f /var/cache/foomatic/*
-
-# Try to rebuild the printconf data
-if [ -x /usr/share/printconf/util/updateconf.py ] ; then
-   /usr/share/printconf/util/updateconf.py >/dev/null 2>&1
-fi
-if [ -x /usr/sbin/printconf-backend ] ; then
-   /usr/sbin/printconf-backend --force-rebuild >/dev/null 2>&1
-fi
-
-# restart the print server if it is running now
-/sbin/service lpd condrestart >/dev/null 2>&1
-/sbin/service cups condrestart >/dev/null 2>&1
-
 exit 0
 
 %clean
@@ -262,6 +248,10 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Oct 12 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-52
+- Removed use of printconf hooks.
+- Don't restart CUPS on upgrade.
+
 * Fri Sep 21 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-51
 - Build requires perl(ExtUtils::MakeMaker).
 - Updated filters to 3.0-20070919.