cups-2.2.10-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12021 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cups/cups-vl.spec

@@ -7,7 +7,7 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 2.2.6
+Version: 2.2.10
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -56,41 +56,33 @@ Patch1: cups-no-gzip-man.patch
 Patch2: cups-system-auth.patch
 Patch3: cups-multilib.patch
 Patch5: cups-banners.patch
-Patch6: cups-serverbin-compat.patch
 Patch7: cups-no-export-ssllibs.patch
 Patch8: cups-direct-usb.patch
-Patch9: cups-lpr-help.patch
-Patch10: cups-peercred.patch
-Patch11: cups-pid.patch
 Patch12: cups-eggcups.patch
 Patch13: cups-driverd-timeout.patch
-Patch14: cups-strict-ppd-line-length.patch
 Patch15: cups-logrotate.patch
 Patch16: cups-usb-paperout.patch
-Patch17: cups-res_init.patch
-Patch18: cups-filter-debug.patch
 Patch19: cups-uri-compat.patch
-Patch20: cups-str3382.patch
-#Patch21: cups-0755.patch
 Patch22: cups-hp-deviceid-oid.patch
 Patch23: cups-dnssd-deviceid.patch
 Patch24: cups-ricoh-deviceid-oid.patch
 Patch25: cups-systemd-socket.patch
-Patch27: cups-avahi-address.patch
-Patch29: cups-dymo-deviceid.patch
 Patch30: cups-freebind.patch
-#Patch31: cups-no-gcry.patch
-Patch33: cups-use-ipp1.1.patch
-Patch34: cups-avahi-no-threaded.patch
 Patch35: cups-ipp-multifile.patch
 Patch36: cups-web-devices-timeout.patch
 Patch37: cups-synconclose.patch
-Patch38: cups-resolv_reload.patch
-Patch39: cups-ypbind.patch
+Patch38: cups-ypbind.patch
 
 #Patch100: cups-lspp.patch
 
-Patch102: cups-serverbin-compat2.patch
+# upstream
+Patch9: cups-lpr-help.patch
+Patch18: cups-filter-debug.patch
+Patch29: cups-dymo-deviceid.patch
+
+# vine
+Patch1000: cups-serverbin-compat.patch
+Patch1001: cups-serverbin-compat2.patch
 
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -220,8 +212,6 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch3 -p1 -b .multilib
 # Ignore rpm save/new files in the banners directory.
 %patch5 -p1 -b .banners
-# Use compatibility fallback path for ServerBin.
-%patch6 -p1 -b .serverbin-compat
 # Don't export SSLLIBS to cups-config.
 %patch7 -p1 -b .no-export-ssllibs
 # Allow file-based usb device URIs.
@@ -229,39 +219,39 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # Add --help option to lpr.
 %patch9 -p1 -b .lpr-help
 # Fix compilation of peer credentials support.
-%patch10 -p1 -b .peercred
+#%%patch10 -p1 -b .peercred
 # Maintain a cupsd.pid file.
-%patch11 -p1 -b .pid
+#%%patch11 -p1 -b .pid
 # Fix implementation of com.redhat.PrinterSpooler D-Bus object.
 %patch12 -p1 -b .eggcups
 # Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
 %patch13 -p1 -b .driverd-timeout
 # Only enforce maximum PPD line length when in strict mode.
-%patch14 -p1 -b .strict-ppd-line-length
+#%%patch14 -p1 -b .strict-ppd-line-length
 # Re-open the log if it has been logrotated under us.
 %patch15 -p1 -b .logrotate
 # Support for errno==ENOSPACE-based USB paper-out reporting.
 %patch16 -p1 -b .usb-paperout
 # Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
-%patch17 -p1 -b .res_init
+#%%patch17 -p1 -b .res_init
 # Log extra debugging information if no filters are available.
 %patch18 -p1 -b .filter-debug
 # Allow the usb backend to understand old-style URI formats.
 %patch19 -p1 -b .uri-compat
 # Fix temporary filename creation.
-%patch20 -p1 -b .str3382
+#%%patch20 -p1 -b .str3382
 # Use mode 0755 for binaries and libraries where appropriate.
 #%%patch21 -p1 -b .0755
 # Add an SNMP query for HP's device ID OID (STR #3552).
 %patch22 -p1 -b .hp-deviceid-oid
 # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
-%patch23 -p1 -b .dnssd-deviceid
+#%%patch23 -p1 -b .dnssd-deviceid
 # Add an SNMP query for Ricoh's device ID OID (STR #3552).
 %patch24 -p1 -b .ricoh-deviceid-oid
 # Make cups.service Type=notify (bug #1088918).
 %patch25 -p1 -b .systemd-socket
 # Use IP address when resolving DNSSD URIs (bug #948288).
-%patch27 -p1 -b .avahi-address
+#%%patch27 -p1 -b .avahi-address
 # Added IEEE 1284 Device ID for a Dymo device (bug #747866).
 %patch29 -p1 -b .dymo-deviceid
 # Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
@@ -269,21 +259,20 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # Don't link against libgcrypt needlessly.
 #%%patch31 -p1 -b .no-gcry
 # Default to IPP/1.1 for now (bug #977813).
-%patch33 -p1 -b .use-ipp1.1
+#%%patch33 -p1 -b .use-ipp1.1
 # Don't use D-Bus from two threads (bug #979748).
-%patch34 -p1 -b .avahi-no-threaded
+#%%patch34 -p1 -b .avahi-no-threaded
 # Fixes for jobs with multiple files and multiple formats.
 %patch35 -p1 -b .ipp-multifile
 # Increase web interface get-devices timeout to 10s (bug #996664).
 %patch36 -p1 -b .web-devices-timeout
 # Set the default for SyncOnClose to Yes.
 %patch37 -p1 -b .synconclose
-# CUPS does not recognize changes to /etc/resolv.conf until CUPS restart (bug #1437065)
-%patch38 -p1 -b .resolv_reload
 # CUPS may fail to start if NIS groups are used (bug #1494558)
-%patch39 -p1 -b .ypbind
+%patch38 -p1 -b .ypbind
 
-%patch102 -p1 -b .serverbin-compat2
+%patch1000 -p1 -b .serverbin-compat
+%patch1001 -p1 -b .serverbin-compat2
 
 # make to use cjktexttops instead texttops.
 perl -pi -e 's/texttops$/cjktexttops/' conf/mime.convs.in
@@ -550,7 +539,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc LICENSE.txt README.md CREDITS.md CHANGES.md
+%license LICENSE.txt
+%doc README.md CREDITS.md CHANGES.md
 %attr(0660,root,lp) %dev(char,6,0) /lib/udev/devices/lp0
 %attr(0660,root,lp) %dev(char,6,1) /lib/udev/devices/lp1
 %attr(0660,root,lp) %dev(char,6,2) /lib/udev/devices/lp2
@@ -654,6 +644,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.10-1
+- new upstream release.
+- dropped Patch10-11, 14, 17, 19-20, 27-28, 33-34 and 38.
+
 * Wed Jan 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.6-1
 - new upstream release.
 - replaced all patches from rawhide.