cups-2.2.6-1

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

c/cups/cups-vl.spec

@@ -7,8 +7,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 2.1.4
-Release: 2%{?_dist_release}
+Version: 2.2.6
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
 
@@ -55,7 +55,6 @@ Source208: cups.conf
 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
@@ -72,29 +71,26 @@ Patch17: cups-res_init.patch
 Patch18: cups-filter-debug.patch
 Patch19: cups-uri-compat.patch
 Patch20: cups-str3382.patch
-Patch21: cups-0755.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
-Patch28: cups-enum-all.patch
 Patch29: cups-dymo-deviceid.patch
 Patch30: cups-freebind.patch
-Patch31: cups-no-gcry.patch
-Patch32: cups-libusb-quirks.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
+
+#Patch100: cups-lspp.patch
 
-Patch101: cups-1.4.6-pstext-utf8.patch
 Patch102: cups-serverbin-compat2.patch
-Patch103: cups-serverbin-compat3.patch
-Patch104: cups-serverbin-compat4.patch
-Patch105: cups-1.7.0-cups-config.patch
 
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -222,7 +218,6 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch2 -p1 -b .system-auth
 # Prevent multilib conflict in cups-config script.
 %patch3 -p1 -b .multilib
-
 # Ignore rpm save/new files in the banners directory.
 %patch5 -p1 -b .banners
 # Use compatibility fallback path for ServerBin.
@@ -256,7 +251,7 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # Fix temporary filename creation.
 %patch20 -p1 -b .str3382
 # Use mode 0755 for binaries and libraries where appropriate.
-%patch21 -p1 -b .0755
+#%%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;".
@@ -265,19 +260,14 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %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
-# Return from cupsEnumDests() once all records have been returned.
-%patch28 -p1 -b .enum-all
 # 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).
 %patch30 -p1 -b .freebind
 # Don't link against libgcrypt needlessly.
-%patch31 -p1 -b .no-gcry
-# Added libusb quirk for Canon PIXMA MP540 (bug #967873).
-%patch32 -p1 -b .libusb-quirks
+#%%patch31 -p1 -b .no-gcry
 # Default to IPP/1.1 for now (bug #977813).
 %patch33 -p1 -b .use-ipp1.1
 # Don't use D-Bus from two threads (bug #979748).
@@ -288,12 +278,12 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %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
 
-#%patch101 -p1 -b .pstext
-%patch102 -p0 -b .serverbin-compat2
-%patch103 -p0 -b .serverbin-compat3
-%patch104 -p1 -b .serverbin-compat4
-%patch105 -p1 -b .cups-config
+%patch102 -p1 -b .serverbin-compat2
 
 # make to use cjktexttops instead texttops.
 perl -pi -e 's/texttops$/cjktexttops/' conf/mime.convs.in
@@ -308,10 +298,13 @@ autoconf
 cp %{SOURCE5} cups-lpd.real
 perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
 
+# Add group wheel to SystemGroups (bug #1405669)
+sed -i -e 's,^SystemGroup .*$, SystemGroup sys root wheel,' conf/cups-files.conf.in
+
 # Let's look at the compilation command lines.
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
-f=CREDITS.txt
+f=CREDITS.md
 mv "$f" "$f"~
 iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
 rm "$f"~
@@ -325,11 +318,12 @@ autoconf -I config-scripts
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 # --enable-debug to avoid stripping binaries
 %configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \
-	--with-cupsd-file-perm=0755 \
-	--with-log-file-perm=0600 --enable-relro \
+	--with-exe-file-perm=0755 \
+	--with-log-file-perm=0600 \
+	--enable-relro \
 	--with-pdftops=pdftops \
 	--with-dbusdir=%{_sysconfdir}/dbus-1 \
-	--with-php=/usr/bin/php5-cgi \
+	--with-php=/usr/bin/php-cgi \
 	--enable-avahi \
 	--enable-threads \
 	--enable-gnutls \
@@ -556,7 +550,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+%doc LICENSE.txt 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
@@ -660,6 +654,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jan 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.6-1
+- new upstream release.
+- replaced all patches from rawhide.
+- updated Patch102.
+
 * Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.4-2
 - rebuilt with new toolchain.