OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Jul-2003 10:34:43
Branch: HEAD Handle: 2003071609344102
Modified files:
openpkg-src/portfwd portfwd.spec
openpkg-web news.txt
Log:
disable Automake fiddling and use new %{l_value} macro to shorten
install procedure
Summary:
Revision Changes Path
1.28 +17 -19 openpkg-src/portfwd/portfwd.spec
1.5586 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 15 Jul 2003 10:01:26 -0000 1.27
+++ openpkg-src/portfwd/portfwd.spec 16 Jul 2003 08:34:43 -0000 1.28
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.26rc6
-Release: 20030715
+Release: 20030716
# package options
%option with_fsl yes
@@ -47,8 +47,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030710, gcc, make, flex
-PreReq: OpenPKG, openpkg >= 20030710
+BuildPreReq: OpenPKG, openpkg >= 20030716, gcc, make, flex
+PreReq: OpenPKG, openpkg >= 20030716
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -67,11 +67,17 @@
%setup -q
# patch source tree
- rm -f config/install-sh
- rm -f config/missing
+ %{l_shtool} subst \
+ -e 's;\(AUTOMAKE\)=.*;\1=true;' \
+ -e 's;\(AUTOCONF\)=.*;\1=true;' \
+ -e 's;\(AUTOHEADER\)=.*;\1=true;' \
+ -e 's;\(ACLOCAL\)=.*;\1=true;' \
+ -e 's;\(MAKEINFO\)=.*;\1=true;' \
+ configure
+ rm -f config/missing config/install-sh
echo "#!/bin/sh" >config/install-sh
echo "#!/bin/sh" >config/missing
- ( echo "#!/bin/sh" ; echo 'exec "$@"' ) >config/depcomp
+ (echo "#!/bin/sh" ; echo 'exec "$@"') >config/depcomp
chmod a+x config/missing config/install-sh config/depcomp
%build
@@ -107,31 +113,23 @@
%{l_shtool} install -c -m 644 \
doc/portfwd.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
%{l_shtool} install -c -m 644 \
- -e 's;conf.txt;portfwd.txt;g' \
+ -e 's;conf\.txt;portfwd.txt;g' \
doc/portfwd.cfg.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
# install default configuration and configuration grammar summary
- %{l_shtool} install -c -m 644 \
- -e 's;@l_nusr@;%{l_nusr};g' \
- -e 's;@l_ngrp@;%{l_ngrp};g' \
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE portfwd.cfg} $RPM_BUILD_ROOT%{l_prefix}/etc/portfwd/
%{l_shtool} install -c -m 644 \
doc/conf.txt $RPM_BUILD_ROOT%{l_prefix}/etc/portfwd/portfwd.txt
# install run-command script
- %{l_shtool} install -c -m 644 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_susr@;%{l_susr};g' \
- -e 's;@l_rusr@;%{l_rusr};g' \
- -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE rc.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# 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.portfwd} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE fsl.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5585 -r1.5586 news.txt
--- openpkg-web/news.txt 16 Jul 2003 08:32:41 -0000 1.5585
+++ openpkg-web/news.txt 16 Jul 2003 08:34:41 -0000 1.5586
@@ -1,3 +1,4 @@
+16-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030716>
16-Jul-2003: Upgraded package: P<pstoedit-3.33-20030716>
16-Jul-2003: Upgraded package: P<openpkg-20030716-20030716>
16-Jul-2003: Upgraded package: P<xmlsec-1.0.4-20030716>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
