cups-2.0.0-1

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

c/cups/cups-vl.spec

@@ -7,7 +7,7 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.7.3
+Version: 2.0.0
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -55,6 +55,7 @@ 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
@@ -76,7 +77,7 @@ Patch22: cups-hp-deviceid-oid.patch
 Patch23: cups-dnssd-deviceid.patch
 Patch24: cups-ricoh-deviceid-oid.patch
 Patch25: cups-systemd-socket.patch
-Patch26: cups-lpd-manpage.patch
+
 Patch27: cups-avahi-address.patch
 Patch28: cups-enum-all.patch
 Patch29: cups-dymo-deviceid.patch
@@ -221,6 +222,7 @@ 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.
@@ -261,11 +263,9 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %patch23 -p1 -b .dnssd-deviceid
 # Add an SNMP query for Ricoh's device ID OID (STR #3552).
 %patch24 -p1 -b .ricoh-deviceid-oid
-# Add support for systemd socket activation (patch from Lennart
+# Make cups.service Type=notify (bug #1088918).
-# Poettering).
+%patch25 -p1 -b .systemd-socket
-##%patch25 -p1 -b .systemd-socket
+
-# Talk about systemd in cups-lpd manpage (part of bug #884641).
-%patch26 -p1 -b .lpd-manpage
 # Use IP address when resolving DNSSD URIs (bug #948288).
 %patch27 -p1 -b .avahi-address
 # Return from cupsEnumDests() once all records have been returned.
@@ -273,7 +273,7 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # 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
+#%%patch30 -p1 -b .freebind
 # Don't link against libgcrypt needlessly.
 %patch31 -p1 -b .no-gcry
 # Added libusb quirk for Canon PIXMA MP540 (bug #967873).
@@ -290,7 +290,7 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 # printing to remote CUPS servers (bug #1010580).
 %patch37 -p1 -b .final-content-type
 # Allow "journal" log type for log output to system journal.
-#%patch38 -p1 -b .journal
+%patch38 -p1 -b .journal
 # Set the default for SyncOnClose to Yes.
 %patch39 -p1 -b .synconclose
 
@@ -342,6 +342,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 	--disable-slp \
 	localedir=%{_datadir}/locale
 
+
 perl -pi -e "s,^DSO	=.*,DSO=gcc -fpic," Makedefs
 
 # If we got this far, all prerequisite libraries must be here.
@@ -599,7 +600,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ipptool
 %{_bindir}/lp.cups
 %{_bindir}/lpoptions
-%attr(4755,root,root) %{_bindir}/lppasswd
 %{_bindir}/lpq.cups
 %{_bindir}/lpr.cups
 %{_bindir}/lprm.cups
@@ -622,6 +622,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/lib/cups/*
 %endif
 %{_mandir}/man1/cancel*
+%{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstest*
 %{_mandir}/man1/ipp*
 %{_mandir}/man1/lp*
@@ -663,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Oct 5 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.0-1
+- new upstream release.
+
 * Sun Jun  8 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.3-1
 - new upstream release.
 - removed Patch100 (fixed in upstream).