gunnar: server/pear/Horde_DOM Horde_DOM.spec, 1.1, 1.2 Makefile, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Wed Sep 10 12:57:03 CEST 2008


Author: gunnar

Update of /kolabrepository/server/pear/Horde_DOM
In directory doto:/tmp/cvs-serv12196/Horde_DOM

Modified Files:
	Horde_DOM.spec Makefile 
Log Message:
Use some simplifications we already used in Kolab_Format.

Index: Horde_DOM.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Horde_DOM.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Horde_DOM.spec	10 Sep 2008 09:43:57 -0000	1.1
+++ Horde_DOM.spec	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,13 +1,12 @@
 # Variables
-%define         V_pear_name Horde_DOM
-%define         V_package %{V_pear_name}
+%define         V_package Horde_DOM
 %define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Wrapper classes for PHP4 domxml compatibility using PHP5s dom functions.
-URL:       http://pear.php.net/package/%{V_pear_name}
+URL:       http://pear.horde.org/index.php?package=%{V_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -16,7 +15,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_pear_name}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -28,21 +27,20 @@
 BuildPreReq:  PEAR-Horde-Channel
 PreReq:       OpenPKG, openpkg >= 20070603
 PreReq:       php, php::with_pear = yes
-PreReq:       PEAR-Horde-Channel
 
 %description 
 These classes allow the use of code written for PHP4's domxml
 implementation to work using PHP5's dom implementation.
 
 %prep
-	%setup -n %{V_pear_name}-%{V_version}
+	%setup -n %{V_package}-%{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 --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/Horde_DOM/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Sep 2008 09:43:57 -0000	1.1
+++ Makefile	10 Sep 2008 10:57:01 -0000	1.2
@@ -1,5 +1,4 @@
-PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([A-Za-z\-\_]*\).*/\1/")
-PACKAGE = $(PEAR_NAME)
+PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 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/")
 
@@ -16,7 +15,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PEAR_NAME)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -27,8 +26,7 @@
 
 .PHONY: clean
 clean:
-	rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
-	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)*
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 





More information about the commits mailing list