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

cvs at kolab.org cvs at kolab.org
Tue Sep 16 14:50:41 CEST 2008


Author: gunnar

Update of /kolabrepository/server/pear/Horde_Group
In directory doto:/tmp/cvs-serv6128

Modified Files:
	ChangeLog Horde_Group.spec Makefile 
Log Message:
Update to Group-0.1.0

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	11 Sep 2008 16:25:07 -0000	1.1
+++ ChangeLog	16 Sep 2008 12:50:39 -0000	1.2
@@ -1,3 +1,7 @@
+2008-09-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Horde_Group.spec: Updated to Group-0.1.0.
+
 2008-09-11  Gunnar Wrobel  <p at rdus.de>
 
 	* Horde_DOM.spec: Added package to Kolab CVS.

Index: Horde_Group.spec
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Group/Horde_Group.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Horde_Group.spec	12 Sep 2008 18:46:46 -0000	1.2
+++ Horde_Group.spec	16 Sep 2008 12:50:39 -0000	1.3
@@ -1,12 +1,13 @@
 # Variables
+%define         V_horde_package Group
 %define         V_package Horde_Group
-%define         V_version 0.0.2.20080912
+%define         V_version 0.1.0
 %define         V_release 1
 
 # Package Information
 Name:	   %{V_package}
 Summary:   Horde User Groups System.
-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}
@@ -35,14 +35,14 @@
 The Group:: class provides the Horde groups system.
 
 %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_Group/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	12 Sep 2008 18:46:46 -0000	1.2
+++ Makefile	16 Sep 2008 12:50:39 -0000	1.3
@@ -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://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
+SOURCE_0=http://pear.horde.org/get/$(HORDE_PACKAGE)-$(VERSION).tgz
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list