[qt] drop "Discover printers shared by CUPS 1.6 (#980952)" (#1054312, #980952#c18)

Kevin Kofler kkofler at fedoraproject.org
Fri Jan 17 22:37:55 UTC 2014


commit 4610e175f869c53d086cd6e0aa2943484c7e5c3e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Jan 17 23:38:04 2014 +0100

    drop "Discover printers shared by CUPS 1.6 (#980952)" (#1054312, #980952#c18)
    
    * Fri Jan 17 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.5-15
    - drop "Discover printers shared by CUPS 1.6 (#980952)" (#1054312, #980952#c18)

 qt-cupsEnumDests.patch |  238 ------------------------------------------------
 qt.spec                |   12 +--
 2 files changed, 4 insertions(+), 246 deletions(-)
---
diff --git a/qt.spec b/qt.spec
index 680b8f3..d38c78a 100644
--- a/qt.spec
+++ b/qt.spec
@@ -29,7 +29,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -61,9 +61,6 @@ Patch4: qt-everywhere-opensource-src-4.8.5-uic_multilib.patch
 # reduce debuginfo in qtwebkit (webcore)
 Patch5: qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch
 
-# cups16 printer discovery
-Patch6: qt-cupsEnumDests.patch
-
 # enable ft lcdfilter
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 
@@ -507,10 +504,6 @@ and invoke methods on those objects.
 rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch4 -p1 -b .uic_multilib
 %patch5 -p1 -b .webcore_debuginfo
-# ie, where cups-1.6+ is present
-%if 0%{?fedora} > 18
-%patch6 -p1 -b .cupsEnumDests
-%endif
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch23 -p1 -b .glib_eventloop_nullcheck
 %patch25 -p1 -b .qdbusconnection_no_debug
@@ -1249,6 +1242,9 @@ fi
 
 
 %changelog
+* Fri Jan 17 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.5-15
+- drop "Discover printers shared by CUPS 1.6 (#980952)" (#1054312, #980952#c18)
+
 * Mon Jan 13 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.5-14
 - fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
 - fix QTBUG-35460 (error message for CVE-2013-4549 is misspelled)


More information about the scm-commits mailing list