Logoj0ke.net Open Build Service > Projects > home:netmax:rebuilds > php4 > Changes
Sign Up | Log In

Changes of Revision 18

[-] Changed php4.spec
x
 
1
@@ -1,4 +1,4 @@
2
-%define contentdir /var/www
3
+%define contentdir /var/www/php4
4
 %define with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0}
5
 %define with_mssql %{?_with_mssql:1}%{!?_with_mssql:0}
6
 %define with_mhash %{?_with_mhash:1}%{!?_with_mhash:0}
7
@@ -530,8 +530,8 @@
8
 %configure \
9
    --libdir=%{_libdir}/php4 \
10
    --cache-file=../config.cache \
11
-   --with-config-file-path=%{_sysconfdir} \
12
-   --with-config-file-scan-dir=%{_sysconfdir}/php.d \
13
+   --with-config-file-path=%{_sysconfdir}/php4 \
14
+   --with-config-file-scan-dir=%{_sysconfdir}/php4.d \
15
    --enable-force-cgi-redirect \
16
    --disable-debug \
17
    --enable-pic \
18
@@ -574,7 +574,7 @@
19
    --enable-trans-sid \
20
    --enable-yp \
21
    --enable-wddx \
22
-   --with-pear=/usr/share/pear \
23
+   --with-pear=/usr/share/pear4 \
24
    --with-imap=shared --with-imap-ssl \
25
    --with-kerberos \
26
    --with-ldap=shared \
27
@@ -603,7 +603,7 @@
28
 
29
 # Build standalone /usr/bin/php4
30
 pushd build-cgi
31
-build --enable-force-cgi-redirect --enable-pcntl
32
+build --enable-fastcgi --enable-force-cgi-redirect --enable-pcntl
33
 popd
34
 
35
 # Build Apache module
36
@@ -637,6 +637,8 @@
37
 mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php4-cgi
38
 make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT
39
 mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php4
40
+mv $RPM_BUILD_ROOT%{_bindir}/phpize $RPM_BUILD_ROOT%{_bindir}/phpize4
41
+mv $RPM_BUILD_ROOT%{_bindir}/php-config $RPM_BUILD_ROOT%{_bindir}/php-config4
42
 popd
43
 
44
 # Install the Apache module
45
@@ -646,7 +648,7 @@
46
 
47
 # Install the default configuration file and icons
48
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
49
-install -m 644    php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
50
+install -m 644    php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php4/php.ini
51
 install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
52
 install -m 644    *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
53
 
54
@@ -656,9 +658,9 @@
55
 
56
 # Apache config fragment
57
 install -m 755 -d $RPM_BUILD_ROOT/etc/httpd/conf.d
58
-install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d
59
+install -m 644 $RPM_SOURCE_DIR/php.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/php4.conf
60
 
61
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
62
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php4.d
63
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4
64
 install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php4/session
65
 
66
@@ -666,13 +668,13 @@
67
 for mod in pgsql mysql odbc ldap snmp domxml xmlrpc imap \
68
     mbstring ncurses gd \
69
     %{?_with_oci8:oci8} %{?_with_mssql:mssql} %{?_with_mhash:mhash}; do
70
-    cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
71
+    cat > $RPM_BUILD_ROOT%{_sysconfdir}/php4.d/${mod}.ini <<EOF
72
 ; Enable ${mod} extension module
73
 extension=${mod}.so
74
 EOF
75
     cat > files.${mod} <<EOF
76
 %attr(755,root,root) %{_libdir}/php4/${mod}.so
77
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${mod}.ini
78
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php4.d/${mod}.ini
79
 EOF
80
 done
81
 
82
@@ -701,28 +703,28 @@
83
 %defattr(-,root,root)
84
 %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
85
 %doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
86
-%config(noreplace) %{_sysconfdir}/php.ini
87
-%config %{_sysconfdir}/pear.conf
88
+%config(noreplace) %{_sysconfdir}/php4/php.ini
89
+%config %{_sysconfdir}/php4/pear.conf
90
 %{_bindir}/php4
91
 %{_bindir}/php4-cgi
92
 %dir %{_libdir}/php4
93
-%{_includedir}/php
94
+%{_includedir}/php4
95
 %dir %{_localstatedir}/lib/php4
96
 %attr(0770,root,apache) %dir %{_localstatedir}/lib/php4/session
97
 %{_libdir}/httpd/modules/libphp4.so
98
-%config %{_sysconfdir}/httpd/conf.d/php.conf
99
+%config %{_sysconfdir}/httpd/conf.d/php4.conf
100
 %dir %{_sysconfdir}/php.d
101
 %{contentdir}/icons/php.gif
102
 
103
 %files pear
104
 %defattr(-,root,root)
105
-%{_bindir}/pear
106
-%{_datadir}/pear
107
+%{_bindir}/pear4
108
+%{_datadir}/pear4
109
 
110
 %files devel
111
 %defattr(-,root,root)
112
-%{_bindir}/php-config
113
-%{_bindir}/phpize
114
+%{_bindir}/php-config4
115
+%{_bindir}/phpize4
116
 #%{_bindir}/phpextdist
117
 %{_libdir}/php4
118
 
119