gunnar: server/pear/PEAR-Date Makefile, 1.3, 1.4 PEAR-Date.spec, 1.3, 1.4

cvs at kolab.org cvs at kolab.org
Mon Jul 23 18:06:46 CEST 2007


Author: gunnar

Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Date

Modified Files:
	Makefile PEAR-Date.spec 
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	11 Jul 2007 14:38:07 -0000	1.3
+++ Makefile	23 Jul 2007 16:06:44 -0000	1.4
@@ -1,27 +1,37 @@
-RPM = /kolab/bin/openpkg rpm
-PNAME= Date
-VERSION = 1.4.7
-NAME = PEAR-$(PNAME)
-PACKAGE = PEAR-$(PNAME)
-RELEASE = 1
-KOLABRELEASE = $(RELEASE)
-
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = /kolab/RPM/PKG
+endif
 
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
 
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-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/")
+
+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/$(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
 
-dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
-	$(RPM) -bB $(PACKAGE).spec
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Date.spec	19 Jul 2007 15:55:24 -0000	1.3
+++ PEAR-Date.spec	23 Jul 2007 16:06:44 -0000	1.4
@@ -1,19 +1,22 @@
-# Defines
-%define    package_name Date
+# Variables
+%define         V_pear_name Date
+%define         V_package PEAR-%{V_pear_name}
+%define         V_version 1.4.7
+%define         V_release 1
 
 # Package Information
-Name:      PEAR-%{package_name}
+Name:	   %{V_package}
 Summary:   PEAR: Generic date/time handling class for PEAR
-URL:       http://pear.php.net/package/%{package_name}
+URL:       http://pear.php.net/package/%{V_pear_name}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
-Version:   1.4.7
-Release:   1
+Version:   %{V_version}
+Release:   %{V_release}
 License:   PHP License
 Group:     Development/Libraries
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source:    http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -36,14 +39,14 @@
 to convert date strings between Gregorian and Human calendar formats.
 
 %prep
-	%setup -n %{package_name}-%{version}
+	%setup -n %{V_pear_name}-%{V_version}
 
 %build
 
 %install
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+	    %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 





More information about the commits mailing list