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: 11-Sep-2003 20:03:17
Branch: HEAD Handle: 2003091119031402
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec platform
openpkg-web news.txt
Log:
improve Linux detection in 'platform' script plus some bugfixes
Summary:
Revision Changes Path
1.43 +1 -0 openpkg-src/openpkg/HISTORY
1.214 +1 -1 openpkg-src/openpkg/openpkg.spec
1.6 +16 -12 openpkg-src/openpkg/platform
1.6510 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.42 -r1.43 HISTORY
--- openpkg-src/openpkg/HISTORY 9 Sep 2003 08:58:44 -0000 1.42
+++ openpkg-src/openpkg/HISTORY 11 Sep 2003 18:03:16 -0000 1.43
@@ -2,6 +2,7 @@
2003
====
+20030911 improve Linux detection in "platform" script
20030909 remove one more GCC extensional feature (in RPM's file/file.h)
20030908 upgrade "platform" script to new "OSSP platform" implementation and
provide %{l_platform}
20030907 add rpm-config(8) utility and add librpmbeecrypt.a to installation tree
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.213 -r1.214 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 9 Sep 2003 08:58:44 -0000 1.213
+++ openpkg-src/openpkg/openpkg.spec 11 Sep 2003 18:03:16 -0000 1.214
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030909
+%define V_openpkg 20030911
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/platform
============================================================================
$ cvs diff -u -r1.5 -r1.6 platform
--- openpkg-src/openpkg/platform 9 Sep 2003 09:28:08 -0000 1.5
+++ openpkg-src/openpkg/platform 11 Sep 2003 18:03:16 -0000 1.6
@@ -357,17 +357,20 @@
v_kern=`echo "${UNAME_RELEASE}" |\
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`
v_libc=`(strings /lib/libc.so.* | grep '^GLIBC_' | sed -e 's/^GLIBC_//' |\
- sort -n | tail -1 | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
2>&1`
+ sort -n | tail -1 | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
2>/dev/null`
ST="GNU/<Linux >${v_libc}/<${v_kern}>"
if [ -f /etc/lsb-release ]; then
eval `( . /etc/lsb-release
- echo "SC=\"LSB${LSB_VERSION}\""
- echo "SP=\"${DISTRIB_ID} ${DISTRIB_RELEASE}\""
+ echo "SC=\"LSB${LSB_VERSION}\""
+ echo "SP=\"${DISTRIB_ID} ${DISTRIB_RELEASE}\""
) 2>/dev/null`
fi
if [ ".$SP" = . ]; then
- for tagfile in dummy `cd /etc && echo *[_-]release *[_-]version
2>/dev/null`; do
- test ! -f /etc/${tagfile} && continue
+ for tagfile in x `cd /etc && \
+ /bin/ls *[_-]release *[_-]version 2>/dev/null | \
+ sed -e '/redhat-release/d'; echo redhat-release`; do
+ [ ".${tagfile}" = .x ] && continue
+ [ ! -f "/etc/${tagfile}" ] && continue
n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e
's/[_-]version$//'`
v=`cat /etc/${tagfile} | grep '[0-9]' | head -1 |\
sed -e 's/^/#/' \
@@ -379,11 +382,12 @@
debian ) n="Debian[ GNU/Linux]" ;;
redhat ) n="RedHat[ Linux]" ;;
suse ) n="SuSE[ Linux]" ;;
- mandrake ) n="Mandrake[ Linux}" ;;
+ mandrake ) n="Mandrake[ Linux]" ;;
gentoo ) n="Gentoo[ Linux]" ;;
* ) n="${n}[ GNU/Linux]" ;;
esac
SP="$n $v"
+ break
done
fi
[ ".$SP" = . ] && SP="${ST}"
@@ -518,27 +522,27 @@
# create output string
output=`echo ":$opt_F" |\
sed -e "s/^://" \
- -e "s;%\[ac\];${AC_V};g" \
+ -e "s;%\\[ac\\];${AC_V};g" \
-e "s;%{ac};${AC_N};g" \
-e "s;%ac;${AC_N};g" \
-e "s;%<ac>;${AC_C};g" \
- -e "s;%\[ap\];${AP_V};g" \
+ -e "s;%\\[ap\\];${AP_V};g" \
-e "s;%{ap};${AP_N};g" \
-e "s;%ap;${AP_N};g" \
-e "s;%<ap>;${AP_C};g" \
- -e "s;%\[at\];${AT_V};g" \
+ -e "s;%\\[at\\];${AT_V};g" \
-e "s;%{at};${AT_N};g" \
-e "s;%at;${AT_N};g" \
-e "s;%<at>;${AT_C};g" \
- -e "s;%\[sc\];${SC_V};g" \
+ -e "s;%\\[sc\\];${SC_V};g" \
-e "s;%{sc};${SC_N};g" \
-e "s;%sc;${SC_N};g" \
-e "s;%<sc>;${SC_C};g" \
- -e "s;%\[sp\];${SP_V};g" \
+ -e "s;%\\[sp\\];${SP_V};g" \
-e "s;%{sp};${SP_N};g" \
-e "s;%sp;${SP_N};g" \
-e "s;%<sp>;${SP_C};g" \
- -e "s;%\[st\];${ST_V};g" \
+ -e "s;%\\[st\\];${ST_V};g" \
-e "s;%{st};${ST_N};g" \
-e "s;%st;${ST_N};g" \
-e "s;%<st>;${ST_C};g" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6509 -r1.6510 news.txt
--- openpkg-web/news.txt 11 Sep 2003 09:10:47 -0000 1.6509
+++ openpkg-web/news.txt 11 Sep 2003 18:03:14 -0000 1.6510
@@ -1,3 +1,4 @@
+11-Sep-2003: Upgraded package: P<openpkg-20030911-20030911>
11-Sep-2003: Upgraded package: P<expect-5.39.0-20030911>
11-Sep-2003: Upgraded package: P<expect-5.39-20030911>
11-Sep-2003: New package: P<tla-1.1pre5-20030911>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
