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 Date: 23-Jun-2003 22:47:55
Branch: HEAD Handle: 2003062321475401
Modified files:
openpkg-src/imapd imapd.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.70 +19 -12 openpkg-src/imapd/imapd.spec
1.4958 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 imapd.spec
--- openpkg-src/imapd/imapd.spec 17 Jun 2003 06:58:54 -0000 1.69
+++ openpkg-src/imapd/imapd.spec 23 Jun 2003 20:47:55 -0000 1.70
@@ -33,9 +33,10 @@
Group: Mail
License: BSD
Version: 2.1.13
-Release: 20030617
+Release: 20030623
# package options
+%option with_fsl yes
%option with_vhost_hack no
# list of sources
@@ -50,8 +51,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, sasl, db >= 4.1.24, openssl, make,
perl, perl-openpkg, fsl
-PreReq: OpenPKG, openpkg >= 20030103, sasl, openssl, perl, MTA, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, sasl, db >= 4.1.24, openssl, make,
perl, perl-openpkg
+PreReq: OpenPKG, openpkg >= 20030415, sasl, openssl, perl, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
Provides: IMAP
@@ -114,7 +119,7 @@
%build
cflags="%{l_cppflags}"
- ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`"
+ ldflags="%{l_ldflags} %{l_fsl_ldflags}"
case "%{l_target}" in
*-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;;
esac
@@ -122,7 +127,7 @@
CPPFLAGS="$cflags" \
CFLAGS="%{l_cflags -O} $cflags" \
LDFLAGS="$ldflags" \
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--cache-file=./cache.config \
--prefix=%{l_prefix} \
@@ -173,7 +178,6 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/imapd \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
$RPM_BUILD_ROOT%{l_prefix}/bin
@@ -200,10 +204,6 @@
-e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
%{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # install fsl configuration
- %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
# use mkimap to create many directories for us
tools/mkimap imapd.conf-mkimap $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve
@@ -219,16 +219,23 @@
tools/mkimap \
$RPM_BUILD_ROOT%{l_prefix}/bin/
+ # OSSP fake syslog library
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
# strip binaries
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
# determine files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
'%config %{l_prefix}/etc/imapd/imapd.conf' \
'%config %{l_prefix}/etc/imapd/cyrus.conf' \
- '%config %{l_prefix}/etc/fsl/fsl.imapd' \
- '%not %dir %{l_prefix}/etc/fsl' \
'%dir %attr(0750,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/imapd' \
'%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \
'%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4957 -r1.4958 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:47:44 -0000 1.4957
+++ openpkg-web/news.txt 23 Jun 2003 20:47:54 -0000 1.4958
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<imapd-2.1.13-20030623>
23-Jun-2003: Upgraded package: P<honeyd-0.5a-20030623>
23-Jun-2003: Upgraded package: P<arpd-0.2-20030623>
23-Jun-2003: Upgraded package: P<libiconv-1.9.1-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
