gunnar: server/pear/Horde_Notification .cvsignore, 1.2, 1.3 Makefile, 1.2, 1.3

cvs at kolab.org cvs at kolab.org
Tue Jul 21 21:28:33 CEST 2009


Author: gunnar

Update of /kolabrepository/server/pear/Horde_Notification
In directory doto:/tmp/cvs-serv27790/Horde_Notification

Modified Files:
	.cvsignore Makefile 
Log Message:
Added the missing Horde_* packages from the framework3 branch.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Notification/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	26 May 2009 05:11:12 -0000	1.2
+++ .cvsignore	21 Jul 2009 19:28:01 -0000	1.3
@@ -1,3 +1,4 @@
 *.src.rpm
 *.tgz
+*.spec
 package.patch

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Notification/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	12 May 2009 05:22:47 -0000	1.2
+++ Makefile	21 Jul 2009 19:28:01 -0000	1.3
@@ -1,155 +1 @@
-# If home is unset this Makefile assumes the Kolab server installation
-# resides in /kolab. If this is not the case this Makefile must be
-# called using
-#
-# HOME="/mykolabroot" make TARGET
-#
-ifeq "x$(HOME)" "x"
-  HOME = /kolab
-endif
-
-# If HOME is set to /root it is likely that somebody is calling this
-# Makefile as root user. In this case this Makefile assumes that the
-# Kolab server installation resides in /kolab.
-#
-# In the (hopefully) unlikely event that somebody really installed the
-# Kolab server in /root this Makefile will fail.
-ifeq "x$(HOME)" "x/root"
-  HOME = /kolab
-endif
-
-# Set the location of the rpm binary
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-
-# Set the location for rpm source package installations
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-
-# Set the location for rpm packages
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-
-# Set the location for the rpm temporary directory
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
-
-# Determine the suffix for binary packages on this system
-ifeq "x$(PLATTAG)" "x"
-	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
-endif
-
-# Determine the staging area for collecting new source rpms
-ifeq "x$(STAGING)" "x"
-  STAGING = ../../stage
-endif
-
-# Determine the horde package name from the *.spec file
-HORDE_PKGDIR = $(shell grep "%define[ ]*V_horde_pkgdir" *.spec | sed -e "s/.*V_horde_pkgdir \([A-Za-z\-\_]*\).*/\1/")
-
-# Determine the horde package name from the *.spec file
-HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
-
-# Determine the package name from the *.spec file
-PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
-
-# Determine the package version from the *.spec file
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.a-z]*\).*/\1/")
-
-# Determine the release number from the *.spec file
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
-
-# Determine the download url for the PEAR package from the *.spec file
-SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*\(.*\)/\1/")
-
-# Get the list of patches if there are any in this directory
-PATCHES = $(shell ls *.patch 2> /dev/null)
-
-# Generate the full package name
-SOURCE_0=$(HORDE_PACKAGE)-$(VERSION).tgz
-
-# Generate a list of extra files for the package
-EXTRA=ChangeLog $(PATCHES)
-
-# CVS information
-UPSTREAM=../upstream/cvs
-REPO=framework
-REPO_URL=:pserver:cvsread at anoncvs.horde.org:/repository
-REPO_UP_CMD=cvs update
-REPO_CO_CMD=cvs -d $(REPO_URL) co
-REPO_SC_CMD=cvs update -r
-COMMIT=HORDE_3_3_4
-RELTAG=20090501
-DATE=$(shell date +%Y-%m-%d)
-PEAR=$(HOME)/bin/pear
-
-# Default target to generate the source rpm package
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-
-# Target for placing the source rpm in the staging area
-.PHONY: dist
-dist: all
-	test -d $(STAGING) || mkdir $(STAGING)
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
-
-# Target for installing the binary rpm package in our current Kolab
-# server installation
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-
-# Target location for the CVS checkout
-$(UPSTREAM):
-	mkdir -p $(UPSTREAM)
-
-# Target for generating the CVS checkout
-.PHONY: $(UPSTREAM)/$(REPO)
-$(UPSTREAM)/$(REPO):
-	if [ -e $(UPSTREAM)/$(REPO) ]; then                     \
-	  cd $(UPSTREAM)/$(REPO) && $(REPO_SC_CMD) "$(COMMIT)"; \
-	else                                                    \
-	  @echo The password is 'horde';                        \
-	  cvs -d $(REPO_URL) login;                             \
-	  cd $(UPSTREAM) && $(REPO_CO_CMD) $(REPO);             \
-	  cd $(UPSTREAM)/$(REPO) && $(REPO_SC_CMD) "$(COMMIT)"; \
-	fi;
-
-# Generate the source pacakge fron the CVS checkout
-.PHONY: $(SOURCE_0)
-$(SOURCE_0): $(UPSTREAM) $(UPSTREAM)/$(REPO)
-	rm -rf tmp
-	mkdir tmp
-	cp -r $(UPSTREAM)/$(REPO)/$(HORDE_PKGDIR) tmp/$(PACKAGE)
-	sed -i -e "/version/,+1 s#<release>\(.*\)</release>#<release>\1dev$(RELTAG)</release>#" tmp/$(PACKAGE)/package.xml
-	sed -i -e "/lead/,+1 s#<date>.*</date>#<date>$(DATE)</date>#" tmp/$(PACKAGE)/package.xml
-	$(PEAR) package tmp/$(PACKAGE)/package.xml
-	rm -rf tmp
-
-# Target for retrieving the source package
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(SOURCE_0)
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/
-
-# Target for preparing the source area and building the package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
-	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-# Target for fetching the source rpm into the current directory
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
-
-# Target for cleaning up the files that can be generated with this Makefile
-.PHONY: clean
-clean:
-	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
-	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf *~
-
+include ../Pear.mk





More information about the commits mailing list