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: 19-Oct-2003 11:21:58
Branch: HEAD Handle: 2003101910215601
Modified files:
openpkg-src/ntp ntp.spec
openpkg-web news.txt
Log:
simplify packaging be reducing subshells
Summary:
Revision Changes Path
1.55 +36 -24 openpkg-src/ntp/ntp.spec
1.7059 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 ntp.spec
--- openpkg-src/ntp/ntp.spec 15 Oct 2003 18:06:11 -0000 1.54
+++ openpkg-src/ntp/ntp.spec 19 Oct 2003 09:21:57 -0000 1.55
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 4.2.0
-Release: 20031015
+Release: 20031019
# package options
%option with_fsl yes
@@ -71,38 +71,50 @@
and some provide automatic server discovery using IP multicast.
%prep
- %setup0 -q -c
- %setup1 -q -T -D -a 1
+ %setup -q
+ %setup -q -T -D -a 1
%build
- ( cd ntp-%{version}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LDFLAGS="%{l_fsl_ldflags}" \
- LIBS="%{l_fsl_libs}" \
- ./configure \
- --prefix=%{l_prefix}
- %{l_shtool} subst \
- -e 's;\(CONFIG_FILE[^"]*"\)/etc/ntp.conf;\1%{l_prefix}/etc/ntp/ntp.conf;'
\
- include/ntp_config.h ntpdate/ntptime_config.c
- %{l_make} %{l_mflags -O}
- ) || exit $?
+ # configure program
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_shtool} subst \
+ -e 's;\(CONFIG_FILE[^"]*"\)/etc/ntp.conf;\1%{l_prefix}/etc/ntp/ntp.conf;' \
+ include/ntp_config.h ntpdate/ntptime_config.c
+
+ # build program
+ %{l_make} %{l_mflags -O}
%install
+ # install program
rm -rf $RPM_BUILD_ROOT
- ( cd ntp-%{version}
- %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- ) || exit $?
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # install manual pages
( cd ntp-doc
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man5
- %{l_shtool} install -c -m 644 *.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man8
- %{l_shtool} install -c -m 644 *.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man5
+ %{l_shtool} install -c -m 644 \
+ *.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ %{l_shtool} install -c -m 644 *.8 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8/
) || exit $?
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/ntp
+
+ # install default configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/ntp
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE ntp.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ntp/
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/ntp/ntpd.stat
+
+ # post-adjust installation
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/ntp/ntpd.stat
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
# install run-command script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7058 -r1.7059 news.txt
--- openpkg-web/news.txt 19 Oct 2003 07:30:39 -0000 1.7058
+++ openpkg-web/news.txt 19 Oct 2003 09:21:56 -0000 1.7059
@@ -1,3 +1,4 @@
+19-Oct-2003: Upgraded package: P<ntp-4.2.0-20031019>
19-Oct-2003: Upgraded package: P<pnetlib-0.6.0.1-20031019>
19-Oct-2003: Upgraded package: P<ncurses-5.3.20031018-20031019>
19-Oct-2003: Upgraded package: P<ircd-2.10.3p3-1.2.1>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
