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:01:08
Branch: HEAD Handle: 2003062322010602
Modified files:
openpkg-src/powerdns powerdns.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.12 +19 -23 openpkg-src/powerdns/powerdns.spec
1.4967 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 powerdns.spec
--- openpkg-src/powerdns/powerdns.spec 14 Jun 2003 14:17:57 -0000 1.11
+++ openpkg-src/powerdns/powerdns.spec 23 Jun 2003 21:01:08 -0000 1.12
@@ -35,7 +35,7 @@
Group: DNS
License: GPL
Version: 2.9.8
-Release: 20030614
+Release: 20030623
# package options
%option with_fsl yes
@@ -52,9 +52,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021204
+BuildPreReq: OpenPKG, openpkg >= 20030415
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl
+PreReq: fsl
%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: MYSQL
@@ -62,10 +63,7 @@
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql, postgresql::with_cxx = yes
%endif
-PreReq: OpenPKG, openpkg >= 20021204
-%if "%{with_fsl}" == "yes"
-PreReq: fsl
-%endif
+PreReq: OpenPKG, openpkg >= 20030415
%if "%{with_mysql}" == "yes"
PreReq: MYSQL
%endif
@@ -105,19 +103,13 @@
MODULES="$MODULES gpgsql"
%endif
MODULES=`echo "$MODULES" | sed 's;^ ;;'`
- lf="%{l_ldflags}"
- li=""
-%if "%{with_fsl}" == "yes"
- lf="$lf `%{l_prefix}/bin/fsl-config --all --ldflags --libs`"
- li="$li `%{l_prefix}/bin/fsl-config --all --libs`"
-%endif
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O} -DDLLIMPORT=" \
CPPFLAGS="%{l_cppflags} -DDLLIMPORT=" \
- LDFLAGS="$lf" \
- LIBS="$li" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
+ LIBS="%{l_fsl_libs}"
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/powerdns \
@@ -170,18 +162,22 @@
%{l_shtool} install -c -m 755 \
%{SOURCE powerdnssetup} $RPM_BUILD_ROOT%{l_prefix}/sbin/
- # Creating fsl directory
- %{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.powerdns} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # 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/
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*' \
- '%config %{l_prefix}/etc/fsl/fsl.powerdns' \
- '%not %dir %{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 %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4966 -r1.4967 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:52:54 -0000 1.4966
+++ openpkg-web/news.txt 23 Jun 2003 21:01:06 -0000 1.4967
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<powerdns-2.9.8-20030623>
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>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
