diff --git a/cups.spec b/cups.spec index beebab3..cc48e18 100644 --- a/cups.spec +++ b/cups.spec @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 19 +Release: 20 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -50,8 +50,9 @@ Patch32: cups-pid.patch Patch33: cups-CAN-2004-0888.patch Patch34: cups-CAN-2005-2097.patch Patch35: cups-finddest.patch -Patch36: cups-str1284.patch -Patch37: cups-dbus.patch +Patch36: cups-str1249.patch +Patch37: cups-str1284.patch +Patch38: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -146,9 +147,10 @@ lpd emulation. %patch33 -p1 -b .CAN-2004-0888 %patch34 -p1 -b .CAN-2005-2097 %patch35 -p1 -b .finddest -%patch36 -p1 -b .str1284 +%patch36 -p1 -b .str1249 +%patch37 -p1 -b .str1284 %if %use_dbus -%patch37 -p1 -b .dbus +%patch38 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -413,6 +415,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/cups/daemon/cups-lpd %changelog +* Wed Oct 5 2005 Tim Waugh 1:1.1.23-20 +- Apply upstream patch for STR #1249. + * Fri Sep 30 2005 Tim Waugh 1:1.1.23-19 - Use upstream patch for STR #1284.