SPECS (AC-branch): cups.spec - sync with HEAD

[charles]

Author: charles                      Date: Thu Feb 15 03:49:34 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- sync with HEAD

---- Files affected:
SPECS:
   cups.spec (1.181 -> 1.181.2.1) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.181 SPECS/cups.spec:1.181.2.1
--- SPECS/cups.spec:1.181	Mon Dec 18 15:05:37 2006
+++ SPECS/cups.spec	Thu Feb 15 04:49:28 2007
@@ -16,13 +16,13 @@
 Summary(pl):	Ogólny system druku dla Uniksa
 Summary(pt_BR):	Sistema Unix de Impressăo
 Name:		cups
-Version:	1.2.7
-Release:	4
+Version:	1.2.8
+Release:	1
 Epoch:		1
 License:	GPL/LGPL
 Group:		Applications/Printing
 Source0:	http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	bf44783d9b46130bee9f2995e6055470
+# Source0-md5:	d2cc0604113d5300b7b3e823b660d04a
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -33,7 +33,6 @@
 Patch4:		%{name}-nostrip.patch
 Patch5:		%{name}-templates.patch
 Patch6:		%{name}-certs_FHS.patch
-Patch7:		%{name}-str2111.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -51,7 +50,7 @@
 %{?with_php:BuildRequires:	php-devel >= 4:5.0.0}
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.344
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.77.3
@@ -63,11 +62,6 @@
 
 %define		_ulibdir	%{_prefix}/lib
 
-%if %{with php}
-%define		_php_configdir /etc/php
-%define		_php_extensiondir %(php-config --extension-dir)
-%endif
-
 %description
 CUPS provides a portable printing layer for UNIX-based operating
 systems. It has been developed by Easy Software Products to promote a
@@ -258,7 +252,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -313,9 +306,9 @@
 
 %if %{with php}
 %{__make} -C scripting/php install \
-	PHPDIR=$RPM_BUILD_ROOT%{_php_extensiondir}
-install -d $RPM_BUILD_ROOT%{_php_configdir}/conf.d
-cat > $RPM_BUILD_ROOT%{_php_configdir}/conf.d/phpcups.ini << EOF
+	PHPDIR=$RPM_BUILD_ROOT%{php_extensiondir}
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cat > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpcups.ini << EOF
 ; Enable phpcups extension module
 extension=phpcups.so
 EOF
@@ -377,13 +370,11 @@
 %postun	image-lib -p /sbin/ldconfig
 
 %post -n php-cups
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun -n php-cups
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
@@ -420,6 +411,7 @@
 %lang(de) %{_ulibdir}/cups/cgi-bin/de
 %lang(es) %{_ulibdir}/cups/cgi-bin/es
 %lang(et) %{_ulibdir}/cups/cgi-bin/et
+%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
 %lang(it) %{_ulibdir}/cups/cgi-bin/it
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
@@ -457,6 +449,7 @@
 %lang(de) %{_datadir}/cups/templates/de
 %lang(es) %{_datadir}/cups/templates/es
 %lang(et) %{_datadir}/cups/templates/et
+%lang(fr) %{_datadir}/cups/templates/fr
 %lang(it) %{_datadir}/cups/templates/it
 %lang(ja) %{_datadir}/cups/templates/ja
 %lang(pl) %{_datadir}/cups/templates/pl
@@ -470,6 +463,7 @@
 %lang(de) %{_datadir}/locale/de/cups_de.po
 %lang(es) %{_datadir}/locale/es/cups_es.po
 %lang(et) %{_datadir}/locale/et/cups_et.po
+%lang(fr) %{_datadir}/locale/fr/cups_fr.po
 %lang(it) %{_datadir}/locale/it/cups_it.po
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
 %lang(pl) %{_datadir}/locale/pl/cups_pl.po
@@ -572,8 +566,8 @@
 %files -n php-cups
 %defattr(644,root,root,755)
 %doc scripting/php/README
-%attr(755,root,root) %{_php_extensiondir}/*
-%config(noreplace) %verify(not md5 mtime size) %{_php_configdir}/conf.d/phpcups.ini
+%attr(755,root,root) %{php_extensiondir}/*
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini
 %endif
 
 %files backend-usb
@@ -594,6 +588,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181.2.1  2007/02/15 03:49:28  charles
+- sync with HEAD
+
 Revision 1.181  2006/12/18 14:05:37  charles
 - s/-templates_pl.patch/-templates.patch/ ; updated
 - added -certs_FHS.patch (moved /certs to /var/lib/cups)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.181&r2=1.181.2.1&f=u