Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	php4.spec
@@ -530,8 +530,9 @@ %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/php.d \ + --sysconfdir=%{_sysconfdir}/php4/ \ --enable-force-cgi-redirect \ --disable-debug \ --enable-pic \ @@ -574,7 +575,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 \ @@ -595,6 +596,7 @@ --enable-mbstring=shared \ --enable-mbstr-enc-trans \ --enable-mbregex \ + --program-suffix=4 \ --with-mime-magic=%{_prefix}/lib/rpm/magic.mime \ $* \|\| tail -300 config.log @@ -658,21 +660,25 @@ 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 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php4/php.d install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4 install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4/session +mv $RPM_BUILD_ROOT%{_bindir}/pear $RPM_BUILD_ROOT/%{_bindir}/pear4 +mv $RPM_BUILD_ROOT%{_bindir}/peardev $RPM_BUILD_ROOT/%{_bindir}/peardev4 +mv $RPM_BUILD_ROOT%{_bindir}/pecl $RPM_BUILD_ROOT/%{_bindir}/pecl4 + # Generate files lists and stub .ini files for each subpackage 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/php.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/php.d/${mod}.ini EOF done @@ -711,13 +717,13 @@ %attr(0770,root,apache) %dir %{_localstatedir}/lib/php4/session %{_libdir}/httpd/modules/libphp4.so %config %{_sysconfdir}/httpd/conf.d/php.conf -%dir %{_sysconfdir}/php.d +%dir %{_sysconfdir}/php4/php.d %{contentdir}/icons/php.gif %files pear %defattr(-,root,root) -%{_bindir}/pear -%{_datadir}/pear +%{_bindir}/pear4 +%{_datadir}/pear4 %files devel %defattr(-,root,root) @@ -725,6 +731,8 @@ %{_bindir}/phpize #%{_bindir}/phpextdist %{_libdir}/php4 +%{_bindir}/peardev4 +%{_bindir}/pecl4 %files pgsql -f files.pgsql %files mysql -f files.mysql