SPECS: cups.spec - use new php extension macros

[glen]

Author: glen                         Date: Tue Jan 16 21:48:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new php extension macros

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

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.181 SPECS/cups.spec:1.182
--- SPECS/cups.spec:1.181	Mon Dec 18 15:05:37 2006
+++ SPECS/cups.spec	Tue Jan 16 22:48:27 2007
@@ -51,7 +51,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 +63,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
@@ -313,9 +308,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
@@ -572,8 +567,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 +589,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.182  2007/01/16 21:48:27  glen
+- use new php extension macros
+
 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.182&f=u