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: 14-Jul-2003 10:25:35
Branch: HEAD Handle: 2003071409253301
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc
openpkg-web news.txt
Log:
- bugfix: print trailing dot only if a leading text was printed
(special case if last package failed to execute the command)
- bugfix: be more robust in word counting via "wc -c"
- enhance: add "rc" command to search path for run-command sections
Summary:
Revision Changes Path
1.10 +1 -0 openpkg-src/openpkg/HISTORY
1.173 +6 -1 openpkg-src/openpkg/openpkg.spec
1.31 +3 -3 openpkg-src/openpkg/rc
1.5552 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.9 -r1.10 HISTORY
--- openpkg-src/openpkg/HISTORY 10 Jul 2003 07:19:37 -0000 1.9
+++ openpkg-src/openpkg/HISTORY 14 Jul 2003 08:25:34 -0000 1.10
@@ -2,6 +2,7 @@
2003
====
+20030714 bugfix verbose output; add "rc" command to search path for run-command
sections
20030710 rename openpkg_runall to openpkg_rc_all, support new openpkg_rc_def.
20030709 fully work-off rc script
20030709 make sure l_fsl_{ldflags,libs} do not produce an error if fsl-config is
not existing
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.172 -r1.173 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 11 Jul 2003 14:26:14 -0000 1.172
+++ openpkg-src/openpkg/openpkg.spec 14 Jul 2003 08:25:34 -0000 1.173
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030711
+%define V_openpkg 20030714
# the used software versions
%define V_rpm 4.0.2
@@ -700,6 +700,10 @@
<`SOURCE rc.openpkg` \
>$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
+ ( echo "#!/bin/sh"
+ echo "exec %{l_prefix}/etc/rc \${1+\"[EMAIL PROTECTED]"}"
+ ) >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rc
+ chmod 755 $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rc
# hard-code RPM tool for installation hierarchy
# and adjust RPM configuration files
@@ -780,6 +784,7 @@
%dir %{l_prefix}/info
%dir %{l_prefix}/lib
%dir %{l_prefix}/lib/openpkg
+ %{l_prefix}/lib/openpkg/rc
%{l_prefix}/lib/openpkg/bash
%{l_prefix}/lib/openpkg/bzip2
%{l_prefix}/lib/openpkg/curl
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.30 -r1.31 rc
--- openpkg-src/openpkg/rc 11 Jul 2003 19:03:37 -0000 1.30
+++ openpkg-src/openpkg/rc 14 Jul 2003 08:25:34 -0000 1.31
@@ -349,7 +349,7 @@
if [ ".$silent" != .1 ]; then
verbose_output=1
echo . | awk '{ printf("OpenPKG: %s: ", cmd); }' cmd="$cmd" 1>&2
- l=`echo . | awk '{ printf("OpenPKG: %s: ", cmd); }' cmd="$cmd"
| wc -c`
+ l=`echo . | awk '{ printf("OpenPKG: %s: ", cmd); }' cmd="$cmd"
| wc -c | awk '{ print $1; }'`
verbose_pos=`expr $verbose_pos + $l`
fi
prefix=""
@@ -358,7 +358,7 @@
fi
if [ ".$silent" != .1 ]; then
echo . | awk '{ printf("%s%s", prefix, s_name); }' prefix="$prefix"
s_name="$s_name" 1>&2
- l=`echo . | awk '{ printf("%s%s", prefix, s_name); }'
prefix="$prefix" s_name="$s_name" | wc -c`
+ l=`echo . | awk '{ printf("%s%s", prefix, s_name); }'
prefix="$prefix" s_name="$s_name" | wc -c | awk '{ print $1; }'`
verbose_pos=`expr $verbose_pos + $l`
fi
fi
@@ -423,7 +423,7 @@
echo ". $tmpfile; rm -f $tmpfile 2>/dev/null || true"
fi
else
- if [ ".$silent" != .1 -a ".$verbose_output" = .1 ]; then
+ if [ ".$silent" != .1 -a ".$verbose_output" = .1 -a $verbose_pos -gt 0 ];
then
echo "." 1>&2
fi
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5551 -r1.5552 news.txt
--- openpkg-web/news.txt 14 Jul 2003 07:30:59 -0000 1.5551
+++ openpkg-web/news.txt 14 Jul 2003 08:25:33 -0000 1.5552
@@ -1,3 +1,4 @@
+14-Jul-2003: Upgraded package: P<openpkg-20030714-20030714>
14-Jul-2003: Upgraded package: P<rt-3.0.4-20030714>
13-Jul-2003: Upgraded package: P<tftp-0.34-20030713>
13-Jul-2003: Upgraded package: P<spegla-1.1p4-20030713>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
