thomas: server/apache-php .cvsignore, NONE, 1.1 Makefile, 1.1, 1.2 kolab.patch, 1.1, 1.2

[cvs at kolab.org]

Author: thomas

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

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


--- NEW FILE: .cvsignore ---
*.src.rpm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	15 May 2008 05:48:03 -0000	1.1
+++ Makefile	20 May 2008 17:11:08 -0000	1.2
@@ -17,7 +17,7 @@
 PACKAGE=apache-php
 VERSION=5.2.6
 RELEASE=20080514
-KOLABRELEASE=20080514_kolab1
+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/apache-php/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	15 May 2008 05:48:03 -0000	1.1
+++ kolab.patch	20 May 2008 17:11:08 -0000	1.2
@@ -10,7 +10,7 @@
  License:      PHP
  Version:      %{V_php}
 -Release:      20080514
-+Release:      20080514_kolab1
++Release:      20080514_kolab
  
  #   package options
  %option       with_suhosin              no