OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 29-Jan-2004 00:36:30
Branch: HEAD Handle: 2004012823362702
Modified files:
openpkg-re/vcheck vc.kolab
openpkg-src/kolab kolab.spec
openpkg-web news.txt
Log:
introduce with_cf option; merge Erfrakon/Intevation and Code Fusion
engines into a single package; track both (place cf on ZfOS); ry to
correctly implement E/I branch/engine/admin numbering; unchain OpenPKG
version number from both engines
Summary:
Revision Changes Path
1.2 +8 -3 openpkg-re/vcheck/vc.kolab
1.10 +53 -15 openpkg-src/kolab/kolab.spec
1.8359 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.kolab
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.kolab
--- openpkg-re/vcheck/vc.kolab 12 Nov 2003 10:57:06 -0000 1.1
+++ openpkg-re/vcheck/vc.kolab 28 Jan 2004 23:36:27 -0000 1.2
@@ -1,9 +1,14 @@
config = {
}
-prog kolab = {
- version = 1.0.14
+prog kolab-cf = {
+ version = 1.0.2
+ url = ftp://ftp.zfos.org/brew/kolab/DST/
+ regex = cfkolab-(__VER__)\.tar\.bz2
+}
+prog kolab-ei = {
+ version = 1.0-1.0.14
url = http://www.erfrakon.de/projects/kolab/download/kolab-server-1.0/src/
- regex = kolab-\d+\.\d+\-(__VER__)\.src\.rpm
+ regex = kolab-(__VER__)\.src\.rpm
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 kolab.spec
--- openpkg-src/kolab/kolab.spec 23 Jan 2004 13:10:12 -0000 1.9
+++ openpkg-src/kolab/kolab.spec 28 Jan 2004 23:36:29 -0000 1.10
@@ -24,24 +24,30 @@
##
# package version
-%define V_major 1.0
-%define V_minor 14
+%define V_ei_bra 1.0
+%define V_ei_eng 1.0
+%define V_ei_adm 1.0.14
+%define V_cf 1.0.2
# package information
Name: kolab
Summary: Kolab Groupware Server
-URL: http://www.kolab.org/
-Vendor: Erfrakon
+URL: http://kolab.kde.org/
+Vendor: Erfrakon, Intevation, Code Fusion
Packager: The OpenPKG Project
Distribution: OpenPKG [PLUS]
Group: KDE
License: GPL
-Version: %{V_major}.%{V_minor}
-Release: 20040121
+Version: 20040129
+Release: 20040129
+
+# package options
+%option with_cf no
# list of sources
-Source0:
http://www.erfrakon.de/projects/kolab/download/kolab-server-1.0/src/kolab-%{V_major}-%{version}.src.rpm
-Source1: rc.kolab
+Source0:
http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_bra}/src/kolab-%{V_ei_eng}-%{V_ei_adm}.src.rpm
+Source1: ftp://ftp.zfos.org/brew/kolab/DST/cfkolab-%{V_cf}.tar.bz2
+Source2: rc.kolab
# build information
Prefix: %{l_prefix}
@@ -54,21 +60,30 @@
PreReq: postfix >= 2.0.16-20031028, postfix::with_ldap = yes,
postfix::with_sasl = yes, postfix::with_ssl = yes
PreReq: imapd >= 2.1.16-20031120, imapd::with_group = yes, imapd::with_vhost
= yes
PreReq: apache >= 1.3.29-20031124, apache::with_gdbm_ndbm = yes,
apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php =
yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes,
apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes,
apache::with_mod_php_xml = yes, apache::with_mod_php_pear = yes, apache::with_mod_ssl
= yes
+%if "%{with_cf}" == "yes"
+PreReq: perl-kolab
+%endif
AutoReq: no
AutoReqProv: no
%description
Kolab is the KDE Groupware Server that provides full groupware
features to either KDE kolab clients or Microsoft Outlook[tm]
- clients with the Bynari Insight Connector http://www.bynari.net. In
- addition it is a robust and flexible general IMAP mail server with
- LDAP addressbook and nice web GUI.
+ clients using third party plugins. In addition it is a robust
+ and flexible general IMAP mail server with LDAP addressbooks.
+
+ The Code Fusion fork adds functionality such as integration with
+ Active Directory, a more modularised backend, separation of the
+ daemon and the configuration generator and more.
%prep
%setup -q -c -T
- echo %{SOURCE0}; pwd
- rpm2cpio <%{SOURCE0} | cpio -iv kolab-%{V_major}.tar.gz
- %{l_gzip} -c -d kolab-%{V_major}.tar.gz | %{l_tar} xf -
+ %{l_bzip2} -c -d %{SOURCE1} | %{l_tar} xf -
+ rpm2cpio <%{SOURCE0} | cpio -iv kolab-%{V_ei_bra}.tar.gz
+ %{l_gzip} -c -d kolab-%{V_ei_bra}.tar.gz | %{l_tar} xf -
+%if "%{with_cf}" == "yes"
+ mv cfkolab-%{V_cf}/* .
+%else
awk <slapd.conf.template \
'// { if ($1 == "pidfile") { print $0"\nreplica-pidfile
@@@kolab_prefix@@@/var/openldap/slurpd.pid" } else print }' \
>slapd.conf.template.NEW && mv slapd.conf.template.NEW slapd.conf.template
@@ -92,6 +107,7 @@
-e 's;killall -INT slapd >/dev/null 2>&1;$kolab_prefix/etc/rc openldap
stop;' \
-e 's;\(system("killall -9 slapd >/dev/null 2>&1")\);#\1;' \
kolab_bootstrap
+%endif
%build
@@ -113,8 +129,30 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- kolab.conf kolab.schema *.template \
+ kolab.conf *.template \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+
+%if "%{with_cf}" == "yes"
+ %{l_shtool} mkdir -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin
+
+ %{l_shtool} install -c -m 744 %{l_value -s -a} \
+ kolabd kolabconf \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/
+
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ kolab.globals \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ kolab.schema kolab-cf.schema \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
+%else
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ kolab.schema \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+%endif
cp -r admin/* $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/admin/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8358 -r1.8359 news.txt
--- openpkg-web/news.txt 28 Jan 2004 20:20:13 -0000 1.8358
+++ openpkg-web/news.txt 28 Jan 2004 23:36:28 -0000 1.8359
@@ -1,3 +1,4 @@
+29-Jan-2004: Upgraded package: P<kolab-20040129-20040129>
28-Jan-2004: Upgraded package: P<sasl-2.1.17-20040128>
28-Jan-2004: Upgraded package: P<gcc34-3.4s20040128-20040128>
28-Jan-2004: Upgraded package: P<dmalloc-5.3.0-20040128>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
