gunnar: server/pear/PEAR-Log .cvsignore, 1.2, 1.3 Makefile, 1.7, 1.8 PEAR-Log.spec, 1.7, NONE

cvs at kolab.org cvs at kolab.org
Tue Dec 8 08:12:21 CET 2009


Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv7903/PEAR-Log

Modified Files:
	.cvsignore Makefile 
Removed Files:
	PEAR-Log.spec 
Log Message:
Update to horde-3.3.5. Some package cleanups.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	22 Jul 2009 06:46:07 -0000	1.2
+++ .cvsignore	8 Dec 2009 07:12:19 -0000	1.3
@@ -1,2 +1,5 @@
 *.src.rpm
+*.tgz
+*.spec
+package.patch
 tmp

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	13 Sep 2007 13:28:13 -0000	1.7
+++ Makefile	8 Dec 2009 07:12:19 -0000	1.8
@@ -1,42 +1 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = PEAR-$(PEAR_NAME)
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-.PHONY: clean
-clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+include ../Pear.mk

--- PEAR-Log.spec DELETED ---





More information about the commits mailing list