summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <wickert@kolabsys.com>2011-03-01 23:19:05 (GMT)
committerChristoph Wickert <wickert@kolabsys.com>2011-03-01 23:19:05 (GMT)
commit71904c2070afe7d20786f8015c0efe946e399e4b (patch)
tree6774c59c3e43b336bcfa4aeaa2fac7edea8bb1ff
parentb08d3e3418f82f538a7edc2c69899af6c1047b24 (diff)
downloadserver-71904c2070afe7d20786f8015c0efe946e399e4b.tar.gz
php: Update to 5.3.5
-rw-r--r--php/Makefile6
-rw-r--r--php/php.spec17
2 files changed, 10 insertions, 13 deletions
diff --git a/php/Makefile b/php/Makefile
index dcd8308..94b73ff 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -1,8 +1,8 @@
include ../make-helper/kolab.mk
-PACKAGE=php
-VERSION=5.3.4
-RELEASE=20101230_kolab1
+PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*\([a-z-]*\).*/\1/")
+VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
SOURCE_URL=http://www.php.net/distributions
SOURCE_0=php-$(VERSION).tar.bz2
diff --git a/php/php.spec b/php/php.spec
index 282ea15..f38b575 100644
--- a/php/php.spec
+++ b/php/php.spec
@@ -21,9 +21,6 @@
## SUCH DAMAGE.
##
-# package versions
-%define V_php 5.3.4
-
# package information
Name: php
Summary: Personal HomePage (PHP)
@@ -34,8 +31,8 @@ Distribution: OpenPKG Community
Class: BASE
Group: Language
License: PHP
-Version: %{V_php}
-Release: 20101230_kolab1
+Version: 5.3.5
+Release: 20110301
# package options
%option with_bc no
@@ -128,11 +125,11 @@ Release: 20101230_kolab1
%endif
# list of sources
-Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
+Source0: http://static.php.net/www.php.net/distributions/php-%{version}.tar.bz2
Source2: php.ini
-Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
+Patch1: http://git.kolab.org/server/tree/php/patches/%{version}/KOLAB_php-%{version}_Annotations.patch
Patch2: php.patch
-Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_myrights.patch
+Patch3: http://git.kolab.org/server/tree/php/patches/%{version}/KOLAB_php-%{version}_myrights.patch
# build information
Prefix: %{l_prefix}
@@ -277,12 +274,12 @@ AutoReqProv: no
%track
prog php = {
- version = %{V_php}
+ version = %{version}
url = http://www.php.net/downloads.php
regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
}
prog php:kolab = {
- version = %{V_php}
+ version = %{version}
url = http://git.kolab.org/server/tree/php/patches/
regex = php-(\d+(\.\d+)+)/
}