OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Feb-2008 20:26:21
Branch: HEAD Handle: 2008021319262000
Modified files:
openpkg-src/citadel citadel.patch citadel.spec
Log:
upgrading package: citadel 7.24 -> 7.31
Summary:
Revision Changes Path
1.7 +14 -3 openpkg-src/citadel/citadel.patch
1.53 +30 -9 openpkg-src/citadel/citadel.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/citadel/citadel.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 citadel.patch
--- openpkg-src/citadel/citadel.patch 9 Mar 2007 06:42:55 -0000 1.6
+++ openpkg-src/citadel/citadel.patch 13 Feb 2008 19:26:20 -0000 1.7
@@ -1,7 +1,18 @@
+Index: libcitadel-1.05/lib/hash.c
+--- libcitadel-1.05/lib/hash.c.orig 2008-01-31 20:09:42 +0100
++++ libcitadel-1.05/lib/hash.c 2008-02-13 20:08:10 +0100
+@@ -3,6 +3,7 @@
+ #include <string.h>
+ //dbg
+ #include <stdio.h>
++#include <time.h>
+ #include "libcitadel.h"
+ #include "lookup3.h"
+
Index: sysdep.c
---- sysdep.c.orig 2007-03-08 04:09:26 +0100
-+++ sysdep.c 2007-03-09 07:39:23 +0100
-@@ -284,6 +284,9 @@
+--- sysdep.c.orig 2008-02-12 18:31:58 +0100
++++ sysdep.c 2008-02-13 19:25:36 +0100
+@@ -271,6 +271,9 @@
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_port = htons((u_short)port_number);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/citadel/citadel.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 citadel.spec
--- openpkg-src/citadel/citadel.spec 1 Jan 2008 14:51:58 -0000 1.52
+++ openpkg-src/citadel/citadel.spec 13 Feb 2008 19:26:20 -0000 1.53
@@ -21,6 +21,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_citadel 7.31
+%define V_libcitadel 1.05
+
# package information
Name: citadel
Summary: Messaging and Collaboration Platform
@@ -31,25 +35,27 @@
Class: EVAL
Group: Mail
License: GNU
-Version: 7.24
-Release: 20080101
+Version: %{V_citadel}
+Release: 20080213
# package options
%option with_ical no
%option with_ldap no
# list of sources
-Source0: http://easyinstall.citadel.org/citadel-%{version}.tar.gz
+Source0: http://easyinstall.citadel.org/citadel-%{V_citadel}.tar.gz
+Source1:
http://easyinstall.citadel.org/libcitadel-%{V_libcitadel}.tar.gz
Patch0: citadel.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, db >= 4.1, make, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: zlib, ncurses, openssl
-PreReq: zlib, ncurses, openssl
+BuildPreReq: zlib, ncurses, openssl, db
+PreReq: zlib, ncurses, openssl, db
%if "%{with_ical}" == "yes"
+BuildPreReq: libical
PreReq: libical
%endif
%if "%{with_ldap}" == "yes"
@@ -74,15 +80,29 @@
%prep
%setup -q
+ %setup -q -T -D -a 1
%patch -p0
%build
+ ( cd libcitadel-%{V_libcitadel}
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags ncurses}" \
+ CXXFLAGS="%{l_cxxflags -O} %{l_cppflags ncurses}" \
+ CPPFLAGS="%{l_cppflags} %{l_cppflags ncurses}" \
+ LDFLAGS="%{l_ldflags}" \
+ LIBS="-lz" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O} %{l_cppflags ncurses}" \
CXXFLAGS="%{l_cxxflags -O} %{l_cppflags ncurses}" \
- CPPFLAGS="%{l_cppflags} %{l_cppflags ncurses}" \
- LDFLAGS="%{l_ldflags}" \
+ CPPFLAGS="%{l_cppflags} %{l_cppflags ncurses}
-I`pwd`/libcitadel-%{V_libcitadel}/lib" \
+ LDFLAGS="%{l_ldflags} -L`pwd`/libcitadel-%{V_libcitadel}/.libs" \
LIBS="-lz" \
./configure \
--prefix=%{l_prefix} \
@@ -127,7 +147,8 @@
$RPM_BUILD_ROOT%{l_prefix}/var/citadel/network/spoolout \
$RPM_BUILD_ROOT%{l_prefix}/var/citadel/network/systems
%{l_shtool} install -c -m 744 %{l_value -s -a} \
- chkpwd $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ citadel citserver citmail getmail userlist chkpwd \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 744 %{l_value -s -a} \
help/[a-z]* $RPM_BUILD_ROOT%{l_prefix}/share/citadel/help/
%{l_shtool} install -c -m 744 %{l_value -s -a} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
