Changes - j0ke.net Open Build Service

Changes of Revision 18

[-] [+]	Changed	php4.spec
@@ -1,4 +1,4 @@ -%define contentdir /var/www +%define contentdir /var/www/php4 %define with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0} %define with_mssql %{?_with_mssql:1}%{!?_with_mssql:0} %define with_mhash %{?_with_mhash:1}%{!?_with_mhash:0} @@ -530,8 +530,8 @@ %configure \ --libdir=%{_libdir}/php4 \ --cache-file=../config.cache \ - --with-config-file-path=%{_sysconfdir} \ - --with-config-file-scan-dir=%{_sysconfdir}/php.d \ + --with-config-file-path=%{_sysconfdir}/php4 \ + --with-config-file-scan-dir=%{_sysconfdir}/php4.d \ --enable-force-cgi-redirect \ --disable-debug \ --enable-pic \ @@ -574,7 +574,7 @@ --enable-trans-sid \ --enable-yp \ --enable-wddx \ - --with-pear=/usr/share/pear \ + --with-pear=/usr/share/pear4 \ --with-imap=shared --with-imap-ssl \ --with-kerberos \ --with-ldap=shared \ @@ -603,7 +603,7 @@ # Build standalone /usr/bin/php4 pushd build-cgi -build --enable-force-cgi-redirect --enable-pcntl +build --enable-fastcgi --enable-force-cgi-redirect --enable-pcntl popd # Build Apache module @@ -637,6 +637,8 @@ mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php4-cgi make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php4 +mv $RPM_BUILD_ROOT%{_bindir}/phpize $RPM_BUILD_ROOT%{_bindir}/phpize4 +mv $RPM_BUILD_ROOT%{_bindir}/php-config $RPM_BUILD_ROOT%{_bindir}/php-config4 popd # Install the Apache module @@ -646,7 +648,7 @@ # Install the default configuration file and icons install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ -install -m 644 php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +install -m 644 php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php4/php.ini install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons install -m 644 .gif $RPM_BUILD_ROOT%{contentdir}/icons/ @@ -656,9 +658,9 @@ # Apache config fragment install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d -install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d +install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/php4.conf -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php4.d install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4 install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4/session @@ -666,13 +668,13 @@ for mod in pgsql mysql odbc ldap snmp domxml xmlrpc imap \ mbstring ncurses gd \ %{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash}; do - cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF + cat > $RPM_BUILD_ROOT%{_sysconfdir}/php4.d/${mod}.ini <<EOF ; Enable ${mod} extension module extension=${mod}.so EOF cat > files.${mod} <<EOF %attr(755,root,root) %{_libdir}/php4/${mod}.so -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php4.d/${mod}.ini EOF done @@ -701,28 +703,28 @@ %defattr(-,root,root) %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README %doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT -%config(noreplace) %{_sysconfdir}/php.ini -%config %{_sysconfdir}/pear.conf +%config(noreplace) %{_sysconfdir}/php4/php.ini +%config %{_sysconfdir}/php4/pear.conf %{_bindir}/php4 %{_bindir}/php4-cgi %dir %{_libdir}/php4 -%{_includedir}/php +%{_includedir}/php4 %dir %{_localstatedir}/lib/php4 %attr(0770,root,apache) %dir %{_localstatedir}/lib/php4/session %{_libdir}/httpd/modules/libphp4.so -%config %{_sysconfdir}/httpd/conf.d/php.conf +%config %{_sysconfdir}/httpd/conf.d/php4.conf %dir %{_sysconfdir}/php.d %{contentdir}/icons/php.gif %files pear %defattr(-,root,root) -%{_bindir}/pear -%{_datadir}/pear +%{_bindir}/pear4 +%{_datadir}/pear4 %files devel %defattr(-,root,root) -%{_bindir}/php-config -%{_bindir}/phpize +%{_bindir}/php-config4 +%{_bindir}/phpize4 #%{_bindir}/phpextdist %{_libdir}/php4