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:51:31
Branch: HEAD Handle: 2003062321513000
Modified files:
openpkg-src/postfix postfix.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.136 +18 -14 openpkg-src/postfix/postfix.spec
1.4965 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.135 -r1.136 postfix.spec
--- openpkg-src/postfix/postfix.spec 20 Jun 2003 06:26:29 -0000 1.135
+++ openpkg-src/postfix/postfix.spec 23 Jun 2003 20:51:30 -0000 1.136
@@ -39,9 +39,10 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20030620
+Release: 20030623
# package options
+%option with_fsl yes
%option with_tls no
%option with_sasl no
%option with_mysql no
@@ -62,8 +63,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, perl, fsl, pcre, db
-PreReq: OpenPKG, openpkg >= 20030103, perl, fsl, procmail, perl-time
+BuildPreReq: OpenPKG, openpkg >= 20030415, perl, pcre, db
+PreReq: OpenPKG, openpkg >= 20030415, perl, procmail, perl-time
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_tls}" == "yes"
BuildPreReq: openssl
%endif
@@ -171,7 +176,7 @@
CCARGS="$CCARGS -DHAS_LDAP"
AUXLIBS="$AUXLIBS -lldap -llber -lssl -lcrypto"
%endif
- AUXLIBS="$AUXLIBS `%{l_prefix}/bin/fsl-config --all --ldflags --libs`"
+ AUXLIBS="$AUXLIBS %{l_fsl_ldflags} %{l_fsl_libs}"
%{l_make} %{l_mflags} makefiles \
CC="%{l_cc}" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS"
@@ -272,24 +277,23 @@
-e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.postfix} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # OSSP fsl support
- %{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.postfix} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
# adjust installation to avoid file name conflicts
( cd $RPM_BUILD_ROOT%{l_prefix}/man/man8
mv master.8 postfix_master.8 )
+ # 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/
+
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \
- '%config %{l_prefix}/etc/fsl/fsl.postfix' \
'%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+ '%attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix' \
'%config %attr(-,root,%{l_mgrp}) %{l_prefix}/etc/postfix/*' \
'%attr(-,root,%{l_mgrp}) %{l_prefix}/libexec/postfix/*' \
'%attr(2755,%{l_musr},%{l_rgrp}) %{l_prefix}/sbin/{postdrop,postqueue}' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4964 -r1.4965 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:51:20 -0000 1.4964
+++ openpkg-web/news.txt 23 Jun 2003 20:51:30 -0000 1.4965
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<postfix-2.0.12-20030623>
23-Jun-2003: Upgraded package: P<portfwd-0.26rc6-20030623>
23-Jun-2003: Upgraded package: P<pks-0.9.6-20030623>
23-Jun-2003: Upgraded package: P<petidomo-4.0b1-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
