Author: glen Date: Fri Jun 17 14:52:13 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- cleanups
- added TODO (really comments needed)
---- Files affected:
SPECS:
php4.spec (1.421.2.3.2.24 -> 1.421.2.3.2.25)
---- Diffs:
================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.24 SPECS/php4.spec:1.421.2.3.2.25
--- SPECS/php4.spec:1.421.2.3.2.24 Fri Jun 17 16:45:00 2005
+++ SPECS/php4.spec Fri Jun 17 16:52:08 2005
@@ -3,6 +3,12 @@
# TODO:
# - make additional headers added by mail patch configurable
# - /var/run/php group not owned
+# TODO both apx build:
+# - what to do with main package?
+# - pl for apache-mod_php4 apache1-mod_php4
+# - Obsoletes apache-mod_php and phpfi are whose? apache2 apache1 module?
both? neither?
+# - how to ensure proper sapi upgrade? (look apache1-mod_php4 preable)
+# - should the apache-mod_php4 provide php{,4} package?
# Conditional build:
%bcond_with db3 # use db3 packages instead of db (4.x) for
Berkeley DB support
%bcond_with fdf # with FDF (PDF forms) module (BR:
proprietary lib)
@@ -46,11 +52,6 @@
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
-# apache2 needs zts
-%if %{with apache2x}
-%define with_zts 1
-%endif
-
# mm is not thread safe
# ext/session/mod_mm.c:37:3: #error mm is not thread-safe
%if %{with zts}
@@ -288,12 +289,12 @@
Group: Development/Languages/PHP
# TODO: how to ensure proper sapi upgrade? assume apache2 was on by default?
PreReq: %{name}-common = %{epoch}:%{version}-%{release}
-Requires(post,preun): %{__perl}
Requires: apache1(EAPI) >= 1.3.33-2
Requires: apache1-mod_mime
Provides: %{name} = %{epoch}:%{version}-%{release}
Provides: php = %{epoch}:%{version}-%{release}
Provides: php4 = %{epoch}:%{version}-%{release}
+# Obsolete last version when apache module was in main package
Obsoletes: php4 < 3:4.3.11-4.16
%description -n apache1-mod_php4
@@ -308,6 +309,7 @@
Provides: %{name} = %{epoch}:%{version}-%{release}
Provides: php = %{epoch}:%{version}-%{release}
Provides: php4 = %{epoch}:%{version}-%{release}
+# Obsolete last version when apache module was in main package
Obsoletes: php4 < 3:4.3.11-4.16
%description -n apache-mod_php4
@@ -1924,27 +1926,27 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n apache-mod_php4
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-fi
-
%post -n apache1-mod_php4
if [ -f /var/lock/subsys/apache ]; then
/etc/rc.d/init.d/apache restart 1>&2
fi
-%postun -n apache-mod_php4
+%postun -n apache1-mod_php4
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
fi
fi
-%postun -n apache1-mod_php4
+%post -n apache-mod_php4
+if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
+fi
+
+%postun -n apache-mod_php4
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
fi
fi
@@ -2949,6 +2951,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.421.2.3.2.25 2005/06/17 14:52:08 glen
+- cleanups
+- added TODO (really comments needed)
+
Revision 1.421.2.3.2.24 2005/06/17 14:45:00 glen
- unused %_ulibdir killed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.421.2.3.2.24&r2=1.421.2.3.2.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
