apache-php/apache-php.spec apache-php/Makefile

[Git Service User]

 apache-php/Makefile        |    7 +++----
 apache-php/apache-php.spec |   19 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 6cd7f9696b0f008f9d54bbb19509bbf34d13f4d2
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Mar 2 00:39:49 2011 +0100

    apache-php: Update to 5.3.5

diff --git a/apache-php/Makefile b/apache-php/Makefile
index 16290ca..64cf666 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -1,9 +1,8 @@
 include ../make-helper/kolab.mk
 
-NAME=apache-php
-PACKAGE = $(NAME)
-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/apache-php/apache-php.spec b/apache-php/apache-php.spec
index 279064b..b87b213 100644
--- a/apache-php/apache-php.spec
+++ b/apache-php/apache-php.spec
@@ -21,9 +21,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package versions
-%define       V_php                     5.3.4
-
 #   package information
 Name:         apache-php
 Summary:      Apache Extension: PHP Scripting Language
@@ -34,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Web
 License:      PHP
-Version:      %{V_php}
-Release:      20101230_kolab1
+Version:      5.3.5
+Release:      20110301
 
 #   package options
 %option       with_bc                   no
@@ -128,12 +125,12 @@ 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:      apache-php.ini
 Source3:      apache-php.conf
-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:       apache-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}
@@ -282,18 +279,18 @@ AutoReqProv:  no
 
 %track
     prog apache-php = {
-        version   = %{V_php}
+        version   = %{version}
         url       = http://www.php.net/downloads.php
         regex     = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
     }
     prog apache-php:kolab = {
-        version   = %{V_php}
+        version   = %{version}
         url       = http://git.kolab.org/server/tree/php/patches/
         regex     = php-(\d+(\.\d+)+)/
     }
 
 %prep
-    %setup -q -n php-%{V_php}
+    %setup -q -n php-%{version}
     %{l_shtool} subst \
         -e 's;-i -a -n php5;-i -n php5;' \
         configure