OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Aug-2005 20:31:11
Branch: HEAD Handle: 2005081519311100
Modified files:
openpkg-src/odoc odoc odoc.spec
Log:
portability fix
Summary:
Revision Changes Path
1.2 +15 -3 openpkg-src/odoc/odoc
1.3 +2 -2 openpkg-src/odoc/odoc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/odoc/odoc
============================================================================
$ cvs diff -u -r1.1 -r1.2 odoc
--- openpkg-src/odoc/odoc 20 Jul 2005 08:29:31 -0000 1.1
+++ openpkg-src/odoc/odoc 15 Aug 2005 18:31:11 -0000 1.2
@@ -23,6 +23,16 @@
## SUCH DAMAGE.
##
+Line()
+ # Emulate the 'line' command.
+ # Copy one complete line unchanged from stdin to stdout.
+{
+ local line
+
+ IFS= read -r line && echo "$line"
+} # Line
+
+
ParseSpec()
# in : $1 - spec file name
# out : $spName, $spSummary, $spURL, $spVendor, $spVersion, $spRelease,
@@ -32,7 +42,7 @@
local defs= defsep= nl=
local var val doBreak
- while l=`line`; do
+ while read -r l; do
case "$l" in
"#"*) ;;
"%define"*)
@@ -76,7 +86,7 @@
var=spDescription
val=
nl=
- while d=`line`; do
+ while read -r d; do
case "$d" in
"%track"*|"%prep"*|"%build"*) break;;
esac
@@ -332,6 +342,7 @@
local section=$2
local tmpFile=$TMPDIR/odoc_s$$
local pkg pkgDocDir pkgDocIndex
+ local moreInfo
openpkg rpm --queryformat
"%{NAME}\n<td>%{VERSION}</td><td>%{RELEASE}</td><td> : %{SUMMARY}</td></tr>\n"
-qa |
while read pkg; do
@@ -341,7 +352,8 @@
then echo -e "$pkg <tr><td><a href=\"$pkgDocIndex\">$pkg</a></td>\c"
else echo -e "$pkg <tr><td>$pkg</td>\c"
fi
- line
+ read -r moreInfo
+ echo "$moreInfo"
done |
sort | sed 's/[^ ][^ ]* //' >$tmpFile
InsertFile $ioFile $section $tmpFile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/odoc/odoc.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 odoc.spec
--- openpkg-src/odoc/odoc.spec 21 Jul 2005 12:16:01 -0000 1.2
+++ openpkg-src/odoc/odoc.spec 15 Aug 2005 18:31:11 -0000 1.3
@@ -32,8 +32,8 @@
Class: EVAL
Group: Development
License: GPL
-Version: 20050721
-Release: 20050721
+Version: 20050815
+Release: 20050815
# list of sources
Source0: odoc
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
