gunnar: server/apache-php Makefile, 1.7, 1.8 kolab.patch, 1.5, 1.6 KOLAB_php-5.2.6_Annotations.patch, 1.1, NONE KOLAB_php-5.2.6_myrights.patch, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Mon Feb 9 11:08:21 CET 2009
- Previous message: gunnar: server release-notes.txt,1.364,1.365
- Next message: gunnar: server/php Makefile, 1.17, 1.18 kolab.patch, 1.13, 1.14 KOLAB_php-5.2.6_Annotations.patch, 1.1, NONE KOLAB_php-5.2.6_myrights.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv25586
Modified Files:
Makefile kolab.patch
Removed Files:
KOLAB_php-5.2.6_Annotations.patch
KOLAB_php-5.2.6_myrights.patch
Log Message:
Update to current 5.2.8 patches.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 12 Dec 2008 14:47:11 -0000 1.7
+++ Makefile 9 Feb 2009 10:08:19 -0000 1.8
@@ -14,17 +14,22 @@
RPM = $(HOME)/bin/openpkg rpm
endif
+ifeq "x$(PLATTAG)" "x"
+ PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+
PACKAGE=apache-php
VERSION=5.2.8
RELEASE=20081209
-KOLABRELEASE=20081209_kolab
+KOLABRELEASE=20081209_kolab2
-PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \
- $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch
+PATCHES=../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
+ ../patches/php/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch
+.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
@@ -44,8 +49,14 @@
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+.PHONY: dist
dist: all
cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+.PHONY: clean
clean:
rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+ $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.patch 12 Dec 2008 14:47:11 -0000 1.5
+++ kolab.patch 9 Feb 2009 10:08:19 -0000 1.6
@@ -10,7 +10,7 @@
License: PHP
Version: %{V_php}
-Release: 20081209
-+Release: 20081209_kolab
++Release: 20081209_kolab2
# package options
%option with_suhosin no
@@ -27,8 +27,8 @@
Source4: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
Patch0: http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
-Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
-+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
-+Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_myrights.patch
++Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
++Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_myrights.patch
# build information
Prefix: %{l_prefix}
--- KOLAB_php-5.2.6_Annotations.patch DELETED ---
--- KOLAB_php-5.2.6_myrights.patch DELETED ---
- Previous message: gunnar: server release-notes.txt,1.364,1.365
- Next message: gunnar: server/php Makefile, 1.17, 1.18 kolab.patch, 1.13, 1.14 KOLAB_php-5.2.6_Annotations.patch, 1.1, NONE KOLAB_php-5.2.6_myrights.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list