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:04
Branch: HEAD Handle: 2003062321510301
Modified files:
openpkg-src/petidomo petidomo.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.34 +24 -12 openpkg-src/petidomo/petidomo.spec
1.4962 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/petidomo/petidomo.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 petidomo.spec
--- openpkg-src/petidomo/petidomo.spec 30 May 2003 19:45:18 -0000 1.33
+++ openpkg-src/petidomo/petidomo.spec 23 Jun 2003 20:51:04 -0000 1.34
@@ -33,7 +33,10 @@
Group: Mail
License: GPL
Version: 4.0b1
-Release: 20030530
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/petidomo/petidomo-%{version}.tar.gz
@@ -43,8 +46,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, bison, flex
-PreReq: OpenPKG, openpkg >= 20020206, fsl, MTA
+BuildPreReq: OpenPKG, openpkg >= 20030415, bison, flex
+PreReq: OpenPKG, openpkg >= 20030415, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -64,8 +71,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}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/petidomo
@@ -82,12 +89,9 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/petidomo
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/petidomo \
- $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo
%{l_shtool} install -c -m 644 \
/dev/null $RPM_BUILD_ROOT%{l_prefix}/var/petidomo/petidomo.log
- %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.petidomo} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
( cd etc.petidomo
l_hostname=`%{l_shtool} echo -e '%h%d'`
%{l_shtool} install -c -m - \
@@ -95,12 +99,20 @@
-e 's;@l_prefix@;%{l_prefix};g' \
* $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo/
)
+
+ # 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/
+
%{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/petidomo/*' \
- '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo' \
- '%config %{l_prefix}/etc/fsl/fsl.petidomo' \
- '%not %dir %{l_prefix}/etc/fsl'
+ '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4961 -r1.4962 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:50:55 -0000 1.4961
+++ openpkg-web/news.txt 23 Jun 2003 20:51:03 -0000 1.4962
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<petidomo-4.0b1-20030623>
23-Jun-2003: Upgraded package: P<openssh-3.6.1p2-20030623>
23-Jun-2003: Upgraded package: P<nsd-1.1.0b-20030623>
23-Jun-2003: Upgraded package: P<inn-2.4.0-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
