diff --git a/cups.spec b/cups.spec index cc48e18..09db59d 100644 --- a/cups.spec +++ b/cups.spec @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 20 +Release: 21 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -52,7 +52,8 @@ Patch34: cups-CAN-2005-2097.patch Patch35: cups-finddest.patch Patch36: cups-str1249.patch Patch37: cups-str1284.patch -Patch38: cups-dbus.patch +Patch38: cups-str1290.patch +Patch39: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -149,8 +150,9 @@ lpd emulation. %patch35 -p1 -b .finddest %patch36 -p1 -b .str1249 %patch37 -p1 -b .str1284 +%patch38 -p1 -b .str1290 %if %use_dbus -%patch38 -p1 -b .dbus +%patch39 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -415,6 +417,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/cups/daemon/cups-lpd %changelog +* Thu Oct 6 2005 Tim Waugh 1:1.1.23-21 +- Apply patch to fix STR #1290. + * Wed Oct 5 2005 Tim Waugh 1:1.1.23-20 - Apply upstream patch for STR #1249.