gunnar: server/php-kolab .cvsignore, NONE, 1.1 Makefile, 1.2, 1.3 php-kolab.spec, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Wed Aug 8 18:31:24 CEST 2007
Author: gunnar
Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv30390
Modified Files:
Makefile php-kolab.spec
Added Files:
.cvsignore
Log Message:
Start adding the filter library.
--- NEW FILE: .cvsignore ---
*.tgz
*.src.rpm
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 8 Aug 2007 14:36:53 -0000 1.2
+++ Makefile 8 Aug 2007 16:31:21 -0000 1.3
@@ -3,7 +3,7 @@
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
MODULES = Kolab_Freebusy \
- #Kolab_Filter \
+ Kolab_Filter \
#Kolab_Webadmin
SOURCES = $(MODULES:%=%-$(VERSION).tgz)
@@ -34,8 +34,8 @@
rm -rf /kolab/RPM/TMP/Kolab_Filter*
rm -rf /kolab/RPM/TMP/Kolab_Webadmin*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
- rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
- rm -rf *~
+ find . -name "*~" | xargs rm -rf
+ rm -rf *.src.rpm
rm -rf *.tgz
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog $(SOURCES)
Index: php-kolab.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/php-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- php-kolab.spec 8 Aug 2007 07:15:03 -0000 1.1
+++ php-kolab.spec 8 Aug 2007 16:31:21 -0000 1.2
@@ -18,7 +18,7 @@
# List of Sources
Source0: Kolab_Freebusy-%{V_version}.tgz
-#Source1: Kolab_Filter-%{V_version}.tgz
+Source1: Kolab_Filter-%{V_version}.tgz
#Source2: Kolab_Webadmin-%{V_version}.tgz
# Build Info
@@ -29,9 +29,9 @@
# Required by several
PreReq: horde-framework-kolab >= 3.1.4.99
# Only for Kolab_Filter
-#PreReq: PEAR-Net_LMTP >= 1.0.1
-#PreReq: PEAR-Net_SMTP >= 1.2.10
-#PreReq: PEAR-Net_IMAP >= 1.1.0beta1
+PreReq: PEAR-Net_LMTP >= 1.0.1
+PreReq: PEAR-Net_SMTP >= 1.2.10
+PreReq: PEAR-Net_IMAP >= 1.1.0beta1
%description
@@ -47,8 +47,8 @@
Kolab_Webadmin groups utilities for the Kolab web admin frontend.
%prep
- %setup -n Kolab_Freebusy-%{V_version}
-# %setup -n Kolab_Filter-%{V_version}
+# %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
@@ -58,9 +58,9 @@
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Freebusy-%{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_Filter-%{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_Filter-%{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" \
More information about the commits
mailing list