diff --git a/cups.spec b/cups.spec index 2604884..a2e74bf 100644 --- a/cups.spec +++ b/cups.spec @@ -49,11 +49,9 @@ Patch30: cups-session-printing.patch Patch32: cups-pid.patch Patch33: cups-CAN-2004-0888.patch Patch34: cups-CAN-2005-2097.patch -Patch35: cups-rate-limit-SendBrowseList.patch -Patch36: cups-BrowseInterval-fix.patch -Patch37: cups-finddest.patch -Patch38: cups-IPP_MAX_VALUES.patch -Patch39: cups-dbus.patch +Patch35: cups-finddest.patch +Patch36: cups-IPP_MAX_VALUES.patch +Patch37: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -147,12 +145,10 @@ lpd emulation. %patch32 -p1 -b .pid %patch33 -p1 -b .CAN-2004-0888 %patch34 -p1 -b .CAN-2005-2097 -%patch35 -p1 -b .rate-limit-SendBrowseList -%patch36 -p1 -b .BrowseInterval-fix -%patch37 -p1 -b .finddest -%patch38 -p1 -b .BrowseInterval-fix +%patch35 -p1 -b .finddest +%patch36 -p1 -b .IPP_MAX_VALUES %if %use_dbus -%patch39 -p1 -b .dbus +%patch37 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -420,8 +416,6 @@ rm -rf $RPM_BUILD_ROOT * Thu Sep 29 2005 Tim Waugh 1:1.1.23-18 - Raise IPP_MAX_VALUES to 100 (bug #164232). - Made FindDest better behaved in some instances (bug #164232). -- Back-ported BrowseInterval fix from 1.1.23 (bug #164232). -- Rate limit SendBrowseList() calls (bug #164232). * Fri Sep 2 2005 Tim Waugh 1:1.1.23-17 - Fixed CAN-2005-2097 (bug #164510).