thomas: server/php .cvsignore, 1.4, 1.5 Makefile, 1.12, 1.13 kolab.patch, 1.8, 1.9

cvs at kolab.org cvs at kolab.org
Tue May 20 19:11:10 CEST 2008


Author: thomas

Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv15596/php

Modified Files:
	Makefile kolab.patch 
Added Files:
	.cvsignore 
Log Message:
Fixes for build infrastructure of php and apache-php



Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	13 May 2008 15:06:23 -0000	1.12
+++ Makefile	20 May 2008 17:11:08 -0000	1.13
@@ -16,8 +16,8 @@
 
 PACKAGE=php
 VERSION=5.2.6
-RELEASE=20080511
-KOLABRELEASE=20080511_kolab1
+RELEASE=20080514
+KOLABRELEASE=20080514_kolab
 
 PATCHES=$(KOLABCVSDIR)/KOLAB_php-5.2.6_Annotations.patch \
         $(KOLABCVSDIR)/KOLAB_php-5.2.6_myrights.patch
@@ -33,10 +33,10 @@
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
-	wget -c http://files.pardus.de/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
 	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.patch	13 May 2008 15:07:50 -0000	1.8
+++ kolab.patch	20 May 2008 17:11:08 -0000	1.9
@@ -9,8 +9,8 @@
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      20080511
-+Release:      20080511_kolab1
+-Release:      20080514
++Release:      20080514_kolab
  
  #   package options
  %option       with_suhosin              no





More information about the commits mailing list