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:52:55
Branch: HEAD Handle: 2003062321525401
Modified files:
openpkg-src/pound pound.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.2 +17 -10 openpkg-src/pound/pound.spec
1.4966 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pound/pound.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 pound.spec
--- openpkg-src/pound/pound.spec 30 May 2003 21:18:00 -0000 1.1
+++ openpkg-src/pound/pound.spec 23 Jun 2003 20:52:55 -0000 1.2
@@ -33,7 +33,10 @@
Group: Web
License: GPL
Version: 1.4
-Release: 20030530
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.apsis.ch/pound/Pound-%{version}.tgz
@@ -45,8 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, openssl, openssl::with_threads =
yes, pth, pth::with_pthread = yes, pcre
-PreReq: OpenPKG, openpkg >= 20020206, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, openssl, openssl::with_threads = yes,
pth, pth::with_pthread = yes, pcre
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -84,7 +91,7 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pthread-config --all --cflags`" \
LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pthread-config --all --ldflags`" \
- LIBS="`%{l_prefix}/bin/pthread-config --all --libs` `%{l_prefix}/bin/fsl-config
--all --libs` -lpcreposix -lpcre" \
+ LIBS="`%{l_prefix}/bin/pthread-config --all --libs` %{l_fsl_libs} -lpcreposix
-lpcre" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/pound \
@@ -99,7 +106,6 @@
# create installation hierarchy
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/etc/pound \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
@@ -120,17 +126,18 @@
%{l_shtool} install -c -m 644 \
%{SOURCE pound.pem} $RPM_BUILD_ROOT%{l_prefix}/etc/pound/
- # install run-command and fsl configuration
- %{l_shtool} install -c -m 644 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE rc.pound} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ # 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.pound} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{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/pound/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4965 -r1.4966 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:51:30 -0000 1.4965
+++ openpkg-web/news.txt 23 Jun 2003 20:52:54 -0000 1.4966
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<pound-1.4-20030623>
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>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
