gunnar: server/kolab-webclient ChangeLog, 1.18, 1.19 kolab-webclient.spec, 1.36, 1.37
cvs at kolab.org
cvs at kolab.org
Sun Jul 12 10:02:16 CEST 2009
- Previous message: gunnar: server/pear/PEAR-Net_LMTP package.info, NONE, 1.1 ChangeLog, 1.1, 1.2 Makefile, 1.2, 1.3 PEAR-Net_LMTP.spec, 1.1, NONE
- Next message: gunnar: server/pear/Horde_Argv package.info, NONE, 1.1 .cvsignore, 1.2, 1.3 ChangeLog, 1.2, 1.3 Makefile, 1.2, 1.3 Horde_Argv.spec, 1.4, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv11757
Modified Files:
ChangeLog kolab-webclient.spec
Log Message:
Removed the pear directory as all PEAR
packages have their own RPM package now.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog 11 Jul 2009 15:12:22 -0000 1.18
+++ ChangeLog 12 Jul 2009 08:02:14 -0000 1.19
@@ -1,3 +1,8 @@
+2009-07-12 Gunnar Wrobel <p at rdus.de>
+
+ * kolab-webclient.spec: Removed the "pear" directory as all PEAR
+ packages have their own RPM package now.
+
2009-07-11 Gunnar Wrobel <p at rdus.de>
* kolab-webclient.spec:
Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kolab-webclient.spec 11 Jul 2009 15:12:22 -0000 1.36
+++ kolab-webclient.spec 12 Jul 2009 08:02:14 -0000 1.37
@@ -2,8 +2,8 @@
%define V_horde_name horde-webmail
%define V_package kolab-webclient
%define V_year 2009
-%define V_month 04
-%define V_day 26
+%define V_month 07
+%define V_day 12
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
@@ -88,10 +88,17 @@
PreReq: Kolab_Format >= 1.0.1
PreReq: Kolab_Server >= 0.5.0
PreReq: Kolab_Storage >= 0.4.0
-
+# Needed by horde
+PreReq: PEAR-Services_Weather
+PreReq: PEAR-DB
+# Needed by horde (translation.php)
+PreReq: PEAR-Console_Table
+PreReq: PEAR-File_Find
+# Needed by ingo
+PreReq: PEAR-Net_Sieve
# Needed by imp
PreReq: PEAR-Auth_SASL >= 1.0.2
-
+PreReq: PEAR-Mail
# Needed by kronolith
PreReq: PEAR-Date_Holidays_Austria >= 0.1.3
PreReq: PEAR-Date_Holidays_Brazil >= 0.1.2
@@ -111,9 +118,10 @@
PreReq: PEAR-Date_Holidays_Ukraine >= 0.1.2
PreReq: PEAR-Date_Holidays_UNO >= 0.1.3
PreReq: PEAR-Date_Holidays_USA >= 0.1.1
+# Needed by turba
+PreReq: PEAR-Net_LDAP
-
-Obsoletes: horde-kolab, horde-kronolith-kolab, horde-imp-kolab, horde-ingo-kolab, horde-kolab-client, horde-dimp-kolab, horde-mimp-kolab, horde-mnemo-kolab, horde-nag-kolab, horde-passwd-kolab, horde-turba-kolab, PEAR-Net_Sieve
+Obsoletes: horde-kolab, horde-kronolith-kolab, horde-imp-kolab, horde-ingo-kolab, horde-kolab-client, horde-dimp-kolab, horde-mimp-kolab, horde-mnemo-kolab, horde-nag-kolab, horde-passwd-kolab, horde-turba-kolab
AutoReq: no
AutoReqProv: no
@@ -155,22 +163,6 @@
# kolab/issue3293 (Big code duplication and code version messup: Horde
# libs in 2.2.1)
- # Use Archive_Tar-1.3.2 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Archive/Tar.php
-
- # Use Structures_Graph-1.0.2 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Structures
-
- # Use Console_Getopt-1.2.3 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Console/Getopt.php
-
- # Use XML_Util-1.2.1 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/XML/Util.php
-
- # Use PEAR-1.7.2 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/OS/Guess.php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/PEAR
-
# Use Horde_Argv-0.1.0dev20090501 from /kolab/lib/php
rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Argv*
@@ -212,14 +204,8 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Storage*
rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Test/Storage.php
- # Use PEAR-Auth_SASL-1.0.2 from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Auth*
-
- # Use PEAR-Date* from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Date*
-
- # Use PEAR-XML_* from /kolab/lib/php
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/XML*
+ # Use the PEAR libraries from /kolab/lib/php
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear
sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
- Previous message: gunnar: server/pear/PEAR-Net_LMTP package.info, NONE, 1.1 ChangeLog, 1.1, 1.2 Makefile, 1.2, 1.3 PEAR-Net_LMTP.spec, 1.1, NONE
- Next message: gunnar: server/pear/Horde_Argv package.info, NONE, 1.1 .cvsignore, 1.2, 1.3 ChangeLog, 1.2, 1.3 Makefile, 1.2, 1.3 Horde_Argv.spec, 1.4, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list