OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Mar-2008 12:08:25
Branch: HEAD Handle: 2008032511082401
Modified files:
openpkg-src/apache-php apache-php.spec
openpkg-src/php php.spec
Log:
switch over to bzip2-compressed tarball; minor cosmetics
Summary:
Revision Changes Path
1.22 +6 -4 openpkg-src/apache-php/apache-php.spec
1.176 +4 -3 openpkg-src/php/php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 25 Mar 2008 09:53:16 -0000
1.21
+++ openpkg-src/apache-php/apache-php.spec 25 Mar 2008 11:08:24 -0000
1.22
@@ -123,7 +123,7 @@
%endif
# list of sources
-Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
+Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: apache-php.ini
Source3: apache-php.conf
@@ -286,7 +286,7 @@
prog apache-php = {
version = %{V_php}
url = http://www.php.net/downloads.php
- regex = php-(5.\d+\.\d+)\.tar\.gz
+ regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
}
prog apache-php:hardened = {
version = %{V_php_hardened}
@@ -581,9 +581,11 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE apache-php.ini} $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
+ %{SOURCE apache-php.ini} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE apache-php.conf}
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
+ %{SOURCE apache-php.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
# create session storage directory
%if "%{with_mm}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.175 -r1.176 php.spec
--- openpkg-src/php/php.spec 25 Mar 2008 09:53:16 -0000 1.175
+++ openpkg-src/php/php.spec 25 Mar 2008 11:08:25 -0000 1.176
@@ -123,7 +123,7 @@
%endif
# list of sources
-Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
+Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: php.ini
Source3: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
@@ -285,7 +285,7 @@
prog php = {
version = %{V_php}
url = http://www.php.net/downloads.php
- regex = php-(5.\d+\.\d+)\.tar\.gz
+ regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
}
prog php:hardened = {
version = %{V_php_hardened}
@@ -580,7 +580,8 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/php
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE php.ini} $RPM_BUILD_ROOT%{l_prefix}/etc/php/
+ %{SOURCE php.ini} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/php/
# strip down installation
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
