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:13
Branch: HEAD Handle: 2003062321511201
Modified files:
openpkg-src/pks pks.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.6 +21 -12 openpkg-src/pks/pks.spec
1.4963 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 pks.spec
--- openpkg-src/pks/pks.spec 25 May 2003 11:21:20 -0000 1.5
+++ openpkg-src/pks/pks.spec 23 Jun 2003 20:51:13 -0000 1.6
@@ -33,7 +33,10 @@
Group: Cryptography
License: GPL
Version: 0.9.6
-Release: 20030525
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://osdn.dl.sourceforge.net/sourceforge/pks/pks-%{version}.tar.gz
@@ -47,8 +50,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, fsl
-PreReq: OpenPKG, openpkg >= 20030103, fsl, MTA
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -65,7 +72,7 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --libs`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -73,7 +80,7 @@
--localstatedir=%{l_prefix}/var/%{name} \
--datadir=%{l_prefix}/share/%{name}
%{l_make} %{l_mflags} \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --libs`"
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
# build suid wrapper for pks-mail
%{l_cc} %{l_cflags} %{l_ldflags} '-DL_PREFIX="%{l_prefix}"' \
@@ -110,13 +117,6 @@
%{l_shtool} install -c -s -m 755 \
pks-mail $RPM_BUILD_ROOT%{l_prefix}/bin/
- # install OSSP fsl configuration
- %{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.pks} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ -133,9 +133,18 @@
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE pks-apache.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
+ # 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/
+
# 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/%{name}/pksd.conf' \
'%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/bin/pks-mail' \
'%dir %attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/%{name}' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4962 -r1.4963 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:51:03 -0000 1.4962
+++ openpkg-web/news.txt 23 Jun 2003 20:51:12 -0000 1.4963
@@ -1,3 +1,4 @@
+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>
23-Jun-2003: Upgraded package: P<nsd-1.1.0b-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
