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:22
Branch: HEAD Handle: 2003062321512001
Modified files:
openpkg-src/portfwd portfwd.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.15 +20 -9 openpkg-src/portfwd/portfwd.spec
1.4964 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 17 Feb 2003 08:57:04 -0000 1.14
+++ openpkg-src/portfwd/portfwd.spec 23 Jun 2003 20:51:21 -0000 1.15
@@ -33,7 +33,10 @@
Group: Network
License: GPL
Version: 0.26rc6
-Release: 20030217
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/portfwd/portfwd-%{version}.tar.gz
@@ -44,8 +47,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021204, fsl, gcc, make, flex
-PreReq: OpenPKG, openpkg >= 20021204, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, gcc, make, flex
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -70,7 +77,7 @@
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags --libs`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags} %{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/portfwd
@@ -82,7 +89,6 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/portfwd \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/man/man5
%{l_shtool} install -c -s -m 755 \
@@ -101,14 +107,19 @@
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE rc.portfwd} $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.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/portfwd/portfwd.cfg' \
- '%config %{l_prefix}/etc/fsl/fsl.portfwd' \
- '%not %dir %{l_prefix}/etc/fsl'
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+ '%config %{l_prefix}/etc/portfwd/portfwd.cfg'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4963 -r1.4964 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:51:12 -0000 1.4963
+++ openpkg-web/news.txt 23 Jun 2003 20:51:20 -0000 1.4964
@@ -1,3 +1,4 @@
+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>
23-Jun-2003: Upgraded package: P<openssh-3.6.1p2-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
