|
|
@@ -27,8 +27,8 @@
|
|
|
Name: php5
|
|
|
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
|
|
|
Summary(ja): HTML 埋め込み型スクリプト言語 PHP
|
|
|
-Version: 5.3.6
|
|
|
-Release: 4%{_dist_release}
|
|
|
+Version: 5.3.7
|
|
|
+Release: 1%{_dist_release}
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -167,10 +167,14 @@ Summary(ja): Apache バージョン 2 用の php5 モジュール
|
|
|
BuildRequires: apache2-devel >= 2.0.50-0vl2
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: apache2 >= 2.0.50-0vl2
|
|
|
+Requires(post): sed, file
|
|
|
Provides: php-apache2 = %{version}-%{release}
|
|
|
|
|
|
%description apache2
|
|
|
-This package contains the php5 module for Apache version 2.
|
|
|
+ This package contains the php5 module for Apache version 2.
|
|
|
+
|
|
|
+ Apache2 must be configured to use prefork MPM because
|
|
|
+this module is not threadsafe.
|
|
|
|
|
|
#======================================================================
|
|
|
# modules
|
|
|
@@ -376,7 +380,9 @@ in their scripts.
|
|
|
cp Zend/LICENSE Zend/ZEND_LICENSE
|
|
|
cp Zend/ChangeLog Zend/ZEND_ChangeLog
|
|
|
cp TSRM/LICENSE TSRM_LICENSE
|
|
|
-cp %{SOURCE20} README.vine
|
|
|
+
|
|
|
+mkdir -p php5-apache2
|
|
|
+cp %{SOURCE20} php5-apache2/README.vine
|
|
|
|
|
|
# Source is built three times:
|
|
|
# once for /usr/bin/php, once for the Apache1 module, once for the Apache2 module.
|
|
|
@@ -385,7 +391,7 @@ mkdir build-cgi build-apache build-apache2
|
|
|
#======================================================================
|
|
|
%build
|
|
|
# Regenerate configure scripts (patches change config.m4's)
|
|
|
-./buildconf --force
|
|
|
+# ./buildconf --force
|
|
|
|
|
|
# Install extension modules in %{_libdir}/%{_name}
|
|
|
export EXTENSION_DIR=%{_libdir}/%{_name}
|
|
|
@@ -662,6 +668,18 @@ chown root:apache %{_localstatedir}/%{_name}/session 2>/dev/null || true
|
|
|
%post apache2
|
|
|
chown root:apache %{_localstatedir}/%{_name}/session 2>/dev/null || true
|
|
|
|
|
|
+MPM=`file /etc/alternatives/apache2 | sed -e 's/^.*apache2\.\([a-z]*\).*$/\1/'`
|
|
|
+if [ "$MPM" != "prefork" ]; then
|
|
|
+ cat <<EOF
|
|
|
+
|
|
|
+ Apache2 is configured to use $MPM MPM. But php5-apache2 requires
|
|
|
+prefork MPM. Run the following command as root to switch MPM:
|
|
|
+
|
|
|
+ /sbin/update-alternatives --config apache2
|
|
|
+
|
|
|
+EOF
|
|
|
+fi
|
|
|
+
|
|
|
%clean
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
|
rm -f files.*
|
|
|
@@ -720,6 +738,7 @@ rm -f files.*
|
|
|
|
|
|
%files apache2
|
|
|
%defattr(-,root,root)
|
|
|
+%doc php5-apache2/README.vine
|
|
|
%config %{apache2_confdir}/%{_name}.conf
|
|
|
%{apache2_moduledir}/lib%{_name}.so
|
|
|
%{apache2_cgidir}/%{_name}-cgi
|
|
|
@@ -740,6 +759,9 @@ rm -f files.*
|
|
|
|
|
|
#======================================================================
|
|
|
%changelog
|
|
|
+* Thu Aug 18 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.7-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Mon Jun 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.3.6-4
|
|
|
- rebuild with unixODBC-2.2.14-2
|
|
|
|
tomop