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 23:01:19
Branch: HEAD Handle: 2003062322011801
Modified files:
openpkg-src/qpopper qpopper.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.43 +24 -13 openpkg-src/qpopper/qpopper.spec
1.4968 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/qpopper.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 qpopper.spec
--- openpkg-src/qpopper/qpopper.spec 30 May 2003 19:47:10 -0000 1.42
+++ openpkg-src/qpopper/qpopper.spec 23 Jun 2003 21:01:19 -0000 1.43
@@ -33,9 +33,10 @@
Group: Mail
License: GPL
Version: 4.0.5
-Release: 20030530
+Release: 20030623
# package options
+%option with_fsl yes
%option with_pam no
# list of sources
@@ -47,8 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, MTA, openssl, fsl
-PreReq: OpenPKG, openpkg >= 20030103, MTA, openssl, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, MTA, openssl
+PreReq: OpenPKG, openpkg >= 20030415, MTA, openssl
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -69,8 +74,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags}" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
%if "%{with_pam}" == "yes"
CFLAGS="$CFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
@@ -105,8 +110,7 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/var/qpopper \
- $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper
# install qpopper
%{l_shtool} install -c -m 644 \
@@ -126,13 +130,20 @@
-e 's;@l_musr@;%{l_musr};g' \
-e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.qpopper} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.qpopper} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %{l_prefix}/etc/qpopper/qpopper.config' \
- '%config %{l_prefix}/etc/fsl/fsl.qpopper' \
- '%not %dir %{l_prefix}/etc/fsl'
+ # 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/
+
+ # determine installation 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/qpopper/qpopper.config'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4967 -r1.4968 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:06 -0000 1.4967
+++ openpkg-web/news.txt 23 Jun 2003 21:01:18 -0000 1.4968
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<qpopper-4.0.5-20030623>
23-Jun-2003: Upgraded package: P<powerdns-2.9.8-20030623>
23-Jun-2003: Upgraded package: P<pound-1.4-20030623>
23-Jun-2003: Upgraded package: P<postfix-2.0.12-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
