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:09
Branch: HEAD Handle: 2003062322020702
Modified files:
openpkg-src/vrrpd vrrpd.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.7 +21 -7 openpkg-src/vrrpd/vrrpd.spec
1.4973 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vrrpd/vrrpd.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 vrrpd.spec
--- openpkg-src/vrrpd/vrrpd.spec 25 May 2003 08:11:47 -0000 1.6
+++ openpkg-src/vrrpd/vrrpd.spec 23 Jun 2003 21:02:09 -0000 1.7
@@ -35,7 +35,10 @@
Group: Networking
License: BSD
Version: 0.8.7
-Release: 20030525
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://www.bsdshell.net/download/freevrrpd-%{version}.tar.gz
@@ -46,8 +49,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, fsl
-PreReq: OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -67,7 +74,7 @@
-e 's;/usr/local/etc/freevrrpd.conf;%{l_prefix}/etc/vrrpd/vrrpd.conf;' \
vrrp_define.h
%{l_shtool} subst \
- -e "s;^\\(LDADD=.*\\);\\1 `%{l_prefix}/bin/fsl-config --ldflags --libs`;" \
+ -e "s;^\\(LDADD=.*\\);\\1 %{l_fsl_ldflags} %{l_fsl_libs};" \
Makefile
case "%{l_target}" in
*-freebsd* ) ;;
@@ -82,7 +89,6 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/etc/vrrpd \
$RPM_BUILD_ROOT%{l_prefix}/var/vrrpd
%{l_shtool} install -c -s -m 755 \
@@ -96,11 +102,19 @@
-e 's;@l_prefix@;%{l_prefix};' \
-e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.vrrpd} $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};' \
- %{SOURCE fsl.vrrpd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ -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/vrrpd/vrrpd.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4972 -r1.4973 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:59 -0000 1.4972
+++ openpkg-web/news.txt 23 Jun 2003 21:02:07 -0000 1.4973
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<vrrpd-0.8.7-20030623>
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>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
