SPECS (AC-branch): cups.spec - update to 1.3.10 from HEAD

Fri Apr 17 11:16:42 CEST 2009

Author: glen                         Date: Fri Apr 17 09:16:42 2009 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update to 1.3.10 from HEAD

---- Files affected:
SPECS:
   cups.spec (1.202.2.6 -> 1.202.2.7) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.202.2.6 SPECS/cups.spec:1.202.2.7

--- SPECS/cups.spec:1.202.2.6	Sat Jul 19 21:43:34 2008
+++ SPECS/cups.spec	Fri Apr 17 11:16:37 2009
@@ -21,13 +21,13 @@
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
-Version:	1.3.7
-Release:	3
+Version:	1.3.10
+Release:	1
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:		Applications/Printing
 Source0:	http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	db4a45a17104f10f3ee599d88267c9e5
+# Source0-md5:	84fffe96b8537c81a463faccead80026
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -38,15 +38,13 @@
 Patch2:		%{name}-options.patch
 Patch3:		%{name}-man_pages_linking.patch
 Patch4:		%{name}-nostrip.patch
-Patch5:		%{name}-templates.patch
-Patch6:		%{name}-certs_FHS.patch
-Patch7:		%{name}-direct_usb.patch
-Patch8:		%{name}-satisfy-any.patch
-Patch9:		%{name}-no-polluted-krb5config.patch
-Patch10:	%{name}-java-fix.patch
-Patch11:	%{name}-verbose-compilation.patch
-Patch12:	%{name}-CVE-2008-1722.patch
-Patch13:	%{name}-translate.patch
+Patch5:		%{name}-certs_FHS.patch
+Patch6:		%{name}-direct_usb.patch
+Patch7:		%{name}-no-polluted-krb5config.patch
+Patch8:		%{name}-java-fix.patch
+Patch9:		%{name}-verbose-compilation.patch
+Patch10:	%{name}-peercred.patch
+Patch11:	%{name}-translate.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -74,6 +72,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.344
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	openssl-tools
 Requires:	pam >= 0.77.3
 Requires:	rc-scripts
 Provides:	printingdaemon
@@ -251,7 +250,7 @@
 Summary:	CUPS java classes
 Summary(pl.UTF-8):	Klasy javy CUPS
 License:	GPL v2 + openssl exception
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Requires:	jpackage-utils
 
 %description -n java-cups
@@ -347,35 +346,35 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 %{__aclocal} -I config-scripts
 %{__autoconf}
 %configure \
 	--libdir=%{_ulibdir} \
+	--disable-cdsassl \
+	--enable-dbus \
 	--enable-shared \
+	--enable-ssl \
+	%{?debug:--enable-debug} \
+	--%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \
+	--%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
+	--%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
+	%{?with_static_libs:--enable-static} \
 	--with-cups-user=lp \
 	--with-cups-group=lp \
 	--with-system-groups=sys \
 	--with-printcap=/etc/printcap \
-	%{?with_static_libs:--enable-static} \
-	--enable-ssl \
-	--%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
-	--%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
-	--%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \
-	--disable-cdsassl \
-	--enable-dbus \
-	%{?debug:--enable-debug} \
+	--with-dbusdir=/etc/dbus-1 \
 	--with-docdir=%{_ulibdir}/%{name}/cgi-bin \
 	--with-config-file-perm=0640 \
 	--with-log-file-perm=0640 \
+	--with-optim=-Wno-format-y2k \
 	%{?with_dnssd:--with-dnssd-libs=x} \
 	%{?with_dnssd:--with-dnssd-includes=x} \
-	%{?with_php:--with-php} \
-	%{?with_perl:--with-perl} \
 	%{?with_java:--with-java} \
+	%{?with_perl:--with-perl} \
+	%{?with_php:--with-php} \
 	%{?with_python:--with-python}
 
 %{__make}
@@ -564,6 +563,7 @@
 %lang(et) %{_ulibdir}/cups/cgi-bin/et
 %lang(fr) %{_ulibdir}/cups/cgi-bin/fr
 %lang(he) %{_ulibdir}/cups/cgi-bin/he
+%lang(id) %{_ulibdir}/cups/cgi-bin/id
 %lang(it) %{_ulibdir}/cups/cgi-bin/it
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
@@ -604,6 +604,7 @@
 %lang(et) %{_datadir}/cups/templates/et
 %lang(fr) %{_datadir}/cups/templates/fr
 %lang(he) %{_datadir}/cups/templates/he
+%lang(id) %{_datadir}/cups/templates/id
 %lang(it) %{_datadir}/cups/templates/it
 %lang(ja) %{_datadir}/cups/templates/ja
 %lang(pl) %{_datadir}/cups/templates/pl
@@ -655,6 +656,7 @@
 %lang(fi) %{_datadir}/locale/fi/cups_fi.po
 %lang(fr) %{_datadir}/locale/fr/cups_fr.po
 %lang(he) %{_datadir}/locale/he/cups_he.po
+%lang(id) %{_datadir}/locale/id/cups_id.po
 %lang(it) %{_datadir}/locale/it/cups_it.po
 %lang(ko) %{_datadir}/locale/ko/cups_ko.po
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
@@ -788,6 +790,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.202.2.7  2009/04/17 09:16:37  glen
+- update to 1.3.10 from HEAD
+
 Revision 1.202.2.6  2008/07/19 19:43:34  glen
 - add cups-translate.patch (just for reference, no real value)
 
@@ -880,7 +885,7 @@
 - -devel R: zlib-devel
 
 Revision 1.177  2006/11/21 18:06:18  charles
-- updated to 1.2.7
+- updated to 1.2.7 [fixes CVE-2007-0720]
 - added it translation
 - -templates_pl.patch is back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cups.spec?r1=1.202.2.6&r2=1.202.2.7&f=u

