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:02:01
Branch: HEAD Handle: 2003062322015902
Modified files:
openpkg-src/teapop teapop.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.21 +26 -16 openpkg-src/teapop/teapop.spec
1.4972 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/teapop/teapop.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 teapop.spec
--- openpkg-src/teapop/teapop.spec 30 May 2003 19:48:53 -0000 1.20
+++ openpkg-src/teapop/teapop.spec 23 Jun 2003 21:02:01 -0000 1.21
@@ -23,6 +23,8 @@
## SUCH DAMAGE.
##
+# FIXME thl fsl version requirement should disappear before release
+
# package information
Name: teapop
Summary: Teapop POP3-Server
@@ -33,7 +35,10 @@
Group: Mail
License: BSD
Version: 0.3.5
-Release: 20030530
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.toontown.org/pub/teapop/teapop-%{version}.tar.gz
@@ -43,8 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030516, fsl >= 1.0.6, gcc, make
-PreReq: OpenPKG, openpkg >= 20030516, fsl >= 1.0.6
+BuildPreReq: OpenPKG, openpkg >= 20030516, gcc, make
+PreReq: OpenPKG, openpkg >= 20030516
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl >= 1.0.6
+PreReq: fsl >= 1.0.6
+%endif
AutoReq: no
AutoReqProv: no
Provides: POP
@@ -70,12 +79,11 @@
teapop/teapop.c
%build
- # Building Teapop with OSSP fsl
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}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/teapop \
@@ -99,21 +107,23 @@
-e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
%{SOURCE rc.teapop} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # Creating fsl directory
- %{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.teapop} $RPM_BUILD_ROOT%{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/
# Stripping installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/cronpopauth.pl \
>/dev/null 2>&1 || true
- # Determining installation tree files
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*' \
- '%config %{l_prefix}/etc/fsl/fsl.teapop' \
- '%not %dir %{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 %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4971 -r1.4972 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:49 -0000 1.4971
+++ openpkg-web/news.txt 23 Jun 2003 21:01:59 -0000 1.4972
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<teapop-0.3.5-20030623>
23-Jun-2003: Upgraded package: P<smtpfeed-1.18-20030623>
23-Jun-2003: Upgraded package: P<sendmail-8.12.9-20030623>
23-Jun-2003: Upgraded package: P<sasl-2.1.13-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
