gunnar: server/horde/horde-framework ChangeLog, 1.3, 1.3.2.1 horde-framework-kolab.spec, 1.5, 1.5.2.1
cvs at kolab.org
cvs at kolab.org
Fri Jul 20 17:07:48 CEST 2007
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv17810/horde/horde-framework
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-framework-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.3.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel <p at rdus.de>
+
+ * horde-framework-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel <p at rdus.de>
* horde-framework-kolab.spec: Update to 20070601
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- horde-framework-kolab.spec 31 May 2007 14:31:10 -0000 1.5
+++ horde-framework-kolab.spec 20 Jul 2007 15:07:46 -0000 1.5.2.1
@@ -2,8 +2,8 @@
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -41,8 +41,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.0
-PreReq: apache >= 1.2.29
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -72,7 +76,7 @@
rm -rf %{l_prefix}/.pearrc
for PKG in **/package.xml; do \
- if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
+ if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/pear/cache" \
%{l_prefix}/bin/pear package $PKG; \
More information about the commits
mailing list