gunnar: server/pear/Horde_Util ChangeLog, 1.1, 1.2 Horde_Util.spec, 1.3, 1.4 Makefile, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Util
In directory doto:/tmp/cvs-serv22158

Modified Files:
	ChangeLog Horde_Util.spec Makefile 
Log Message:
Update to the latest release package prepared upstream.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	10 Sep 2008 09:55:48 -0000	1.1
+++ ChangeLog	26 Sep 2008 05:32:58 -0000	1.2
@@ -1,4 +1,8 @@
+2008-09-25  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Util.spec: Update to 0.1.0.
+
 2008-09-10  Gunnar Wrobel  <p at rdus.de>
 
-	* Horde_DOM.spec: Added package to Kolab CVS.
+	* Horde_Util.spec: Added package to Kolab CVS.
 

Index: Horde_Util.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Util/Horde_Util.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Horde_Util.spec	22 Sep 2008 07:10:01 -0000	1.3
+++ Horde_Util.spec	26 Sep 2008 05:32:58 -0000	1.4
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package Util
 %define         V_package Horde_Util
-%define         V_version 0.0.2.20080915
-%define         V_release 1
+%define         V_version 0.1.0
+%define         V_release 20080925
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde Utility Libraries
-URL:       http://pear.horde.org/index.php?package=%{V_package}
+URL:       http://pear.horde.org/index.php?package=%{V_horde_package}
 Packager:  Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
 Version:   %{V_version}
 Release:   %{V_release}
@@ -15,8 +16,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source:    http://pear.horde.org/get/%{V_horde_package}-%{V_version}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -33,14 +33,14 @@
 These classes provide functionality useful for all kind of applications.
 
 %prep
-	%setup -n %{V_package}-%{V_version}
+	%setup -n %{V_horde_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_package}-%{V_version}.tgz
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_horde_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_Util/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	22 Sep 2008 07:10:01 -0000	1.3
+++ Makefile	26 Sep 2008 05:32:58 -0000	1.4
@@ -1,3 +1,4 @@
+HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z\-\_]*\).*/\1/")
 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/")
@@ -15,8 +16,7 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm