gunnar: server/php-kolab DEVELOPMENT, 1.2, 1.3 Makefile, 1.7, 1.8 php-kolab.spec, 1.3, 1.4

cvs at kolab.org cvs at kolab.org
Thu Aug 16 14:16:53 CEST 2007


Author: gunnar

Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv6190

Modified Files:
	DEVELOPMENT Makefile php-kolab.spec 
Log Message:
Add the draft for the webadmin pear library. Add AUTHORS files to the pear packages.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEVELOPMENT	15 Aug 2007 19:49:43 -0000	1.2
+++ DEVELOPMENT	16 Aug 2007 12:16:51 -0000	1.3
@@ -59,6 +59,6 @@
 Contributors
 ============
 
-The developers of this package are listed in
-"Kolab_*/package.xml.in". Please keep this file up-to-date if you
-change the source code of this package.
+The developers of the packages are listed in "Kolab_*/AUTHORS". A
+short list is also available in "Kolab_*/package.xml.in". Please keep
+both up-to-date if you change the source code of this package.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	16 Aug 2007 06:32:46 -0000	1.7
+++ Makefile	16 Aug 2007 12:16:51 -0000	1.8
@@ -15,7 +15,7 @@
 
 MODULES = Kolab_Freebusy \
           Kolab_Filter   \
-          #Kolab_Webadmin
+          Kolab_Webadmin
 
 SOURCES = $(MODULES:%=%-$(SOURCE_TAG).tgz)
 

Index: php-kolab.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/php-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- php-kolab.spec	13 Aug 2007 14:14:13 -0000	1.3
+++ php-kolab.spec	16 Aug 2007 12:16:51 -0000	1.4
@@ -20,7 +20,7 @@
 # List of Sources
 Source0:    Kolab_Freebusy-%{V_source_tag}.tgz
 Source1:    Kolab_Filter-%{V_source_tag}.tgz
-#Source2:    Kolab_Webadmin-%{V_source_tag}.tgz
+Source2:    Kolab_Webadmin-%{V_source_tag}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -48,9 +48,6 @@
 Kolab_Webadmin groups utilities for the Kolab web admin frontend.
 
 %prep
-#	%setup -q -n %{V_package}-%{V_version} -a 0 -c
-#	%setup -q -n %{V_package}-%{V_version} -a 1 -D
-#	%setup -n Kolab_Webadmin-%{V_version}
 
 %build
 
@@ -63,9 +60,9 @@
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
 	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Filter-%{V_source_tag}.tgz
 
-#        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/Kolab_Webadmin-%{V_version}.tgz
+        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/Kolab_Webadmin-%{V_source_tag}.tgz
 
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 





More information about the commits mailing list