SPECS: mapserver.spec - php conf.d and api version; rel 2

[glen]

Author: glen                         Date: Thu Sep 15 17:42:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- php conf.d and api version; rel 2

---- Files affected:
SPECS:
   mapserver.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/mapserver.spec
diff -u SPECS/mapserver.spec:1.23 SPECS/mapserver.spec:1.24
--- SPECS/mapserver.spec:1.23	Wed Sep  7 16:13:37 2005
+++ SPECS/mapserver.spec	Thu Sep 15 19:42:06 2005
@@ -13,7 +13,7 @@
 Summary(pl):	Generowanie map poprzez WWW
 Name:		mapserver
 Version:	4.6.1
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Applications
 Source0:	http://cvs.gis.umn.edu/dist/%{name}-%{version}.tar.gz
@@ -35,9 +35,10 @@
 BuildRequires:	ming-devel
 BuildRequires:	pdflib-devel
 BuildRequires:	perl-devel
-BuildRequires:	php-devel >= 4.2.3
+BuildRequires:	php-devel >= 3:4.2.3
 BuildRequires:	proj-devel >= 4
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.238
 %{?with_ms_tcl:BuildRequires:	tcl-devel}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -94,7 +95,7 @@
 Summary:	MapScript module for PHP
 Summary(pl):	Moduł MapScript dla PHP
 Group:		Libraries
-PreReq:		php-common = %(rpm -q --qf '%%{EPOCH}:%%{VERSION}' php-common)
+%{?requires_php_extension}
 
 %description -n php-mapscript
 MapScript extension module for PHP.
@@ -157,7 +158,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/php,%{_includedir}/mapserver}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/php,%{_sysconfdir}/php/conf.d,%{_includedir}/mapserver}
 
 install legend mapserv scalebar tile4ms \
 	shp2img shp2pdf shptree shptreetst sortshp \
@@ -166,6 +167,10 @@
 install map.h $RPM_BUILD_ROOT%{_includedir}/mapserver
 
 install mapscript/php3/php_mapscript.so $RPM_BUILD_ROOT%{_libdir}/php
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d/mapscript.ini
+; Enable mapscript extension module
+extension=php_mapscript.so
+EOF
 
 %{__make} -C mapscript/perl install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -179,13 +184,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n php-mapscript
-/usr/sbin/php-module-install install php_mapscript /etc/php/php.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun -n php-mapscript
-if [ "$1" = "0" ]; then
-	/usr/sbin/php-module-install remove php_mapscript /etc/php/php.ini
+%postun -n php-mapscript
+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
 fi
 
+%triggerpostun -n php-mapscript -- php-mapscript < 4.6.1-1.1
+/usr/sbin/php-module-install remove php_mapscript /etc/php/php.ini
+
 %files
 %defattr(644,root,root,755)
 %doc README HISTORY.TXT
@@ -207,6 +217,7 @@
 %files -n php-mapscript
 %defattr(644,root,root,755)
 %doc mapscript/php3/README mapscript/php3/examples/*.phtml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php/conf.d/mapscript.ini
 %attr(755,root,root) %{_libdir}/php/php_mapscript.so
 
 %if %{with ms_tcl}
@@ -225,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/09/15 17:42:06  glen
+- php conf.d and api version; rel 2
+
 Revision 1.23  2005/09/07 14:13:37  glen
 - autotools called directly, revert last change
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mapserver.spec?r1=1.23&r2=1.24&f=u