- fixed previous commit (pl %description for litespeed)

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 21116c6e9e1f1382070817ee025c5e4330006b9b..9856d07265e656e267cafff900b178fc9b5578f5 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -16,6 +16,7 @@
 #   +Patch44:  %{name}-include_path.patch
 #   +Patch45:  %{name}-imap-annotations.patch
 #   +Patch46:  %{name}-imap-myrights.patch
+# - php CLI has safe mode enabled off the box
 # - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
 #   - removed from php 5.0 (currently in php4):
 #   db, hyperwave, java, mcal, overload, qtdom
@@ -47,6 +48,7 @@
 %bcond_with    interbase_inst  # use InterBase install., not Firebird  (BR: proprietary libs)
 %bcond_with    oci8            # with Oracle oci8 extension module     (BR: proprietary libs)
 %bcond_with    system_gd       # with system gd (we prefer internal since it enables few more features)
+%bcond_with    litespeed       # build litespeed module
 %bcond_without curl            # without CURL extension module
 %bcond_without filter          # without filter extension module
 %bcond_without imap            # without IMAP extension module
@@ -104,7 +106,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel             1.11
+%define                rel             1.12
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -138,6 +140,8 @@ Patch7:             %{name}-sapi-ini-file.patch
 Patch8:                %{name}-config-file-scan-dir.patch
 Patch9:                %{name}-sh.patch
 Patch10:       %{name}-ini.patch
+# untill 5.3.2 when this gets released
+Patch11:       %{name}-bug-50458.patch
 %if %{with type_hints}
 Patch12:       http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -176,9 +180,10 @@ BuildRequires:     bzip2-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db-devel >= 4.0
 BuildRequires: elfutils-devel
+BuildRequires: fcgi-devel
 %{?with_fdf:BuildRequires:     fdftk-devel}
 BuildRequires: flex
-Requires:      fcgi-devel
+BuildRequires: pkgconfig
 %if %{with mssql} || %{with sybase_ct}
 BuildRequires: freetds-devel >= 0.82
 %endif
@@ -344,6 +349,20 @@ PHP as DSO module for apache 2.x.
 %description -n apache-mod_php -l pl.UTF-8
 php jako moduł DSO (Dynamic Shared Object) dla apache 2.x.
 
+%package litespeed
+Summary:       PHP for litespeed http server
+Summary(pl.UTF-8):     PHP dla serwera http litespeed
+Group:         Development/Languages/PHP
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      litespeed
+Provides:      webserver(php) = %{version}
+
+%description litespeed
+PHP for litespeed http server.
+
+%description litespeed -l pl.UTF-8
+PHP dla serwera http litespeed.
+
 %package cgi
 Summary:       PHP as CGI/FastCGI program
 Summary(pl.UTF-8):     PHP jako program CGI/FastCGI
@@ -1735,6 +1754,8 @@ cp php.ini-production php.ini
 %patch51 -p1
 %patch52 -p1
 
+%patch11 -p4
+
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1806,6 +1827,9 @@ apxs1
 %if %{with apache2}
 apxs2
 %endif
+%if %{with litespeed}
+litespeed
+%endif
 "
 for sapi in $sapis; do
        : SAPI $sapi
@@ -1831,6 +1855,9 @@ for sapi in $sapis; do
                ver=$(rpm -q --qf '%{V}' apache-devel)
                sapi_args="--disable-cli --with-apxs2=%{apxs2} --with-apache-version=$ver"
        ;;
+       litespeed)
+               sapi_args='--with-litespeed'
+       ;;
        esac
 
        %configure \
@@ -1971,6 +1998,10 @@ sed -i -e "s,@PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in"
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
 %endif
 
+%if %{with litespeed}
+%{__make} -f Makefile.litespeed
+%endif
+
 # CGI/FCGI
 cp -af php_config.h.cgi-fcgi main/php_config.h
 %{__make} -f Makefile.cgi-fcgi
@@ -2016,6 +2047,11 @@ libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{
 libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
 %endif
 
+# install litespeed sapi
+%if %{with litespeed}
+libtool --silent --mode=install install sapi/litespeed/php $RPM_BUILD_ROOT%{_bindir}/php.litespeed
+%endif
+
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 # fix install paths, avoid evil rpaths
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
@@ -2434,6 +2470,12 @@ fi
 %attr(755,root,root) %{_libdir}/apache/libphp5.so
 %endif
 
+%if %{with litespeed}
+%files litespeed
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/php.litespeed
+%endif
+
 %files cgi
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/cgi-fcgi.d