RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jul-2007 11:01:52
Branch: HEAD Handle: 2007072410015200
Modified files:
rpm configure.ac
Log:
add version only if no version is already existing in the OS
information, please
Summary:
Revision Changes Path
2.217 +6 -2 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.216 -r2.217 configure.ac
--- rpm/configure.ac 24 Jul 2007 07:42:59 -0000 2.216
+++ rpm/configure.ac 24 Jul 2007 09:01:52 -0000 2.217
@@ -140,9 +140,13 @@
LINUX* ) RPM_OS_NAME="LINUX" ;;
esac
v1=0; v2=0; v3=0
-uname_r="`uname -r`"
+my_os="$host_os"
+case "$my_os" in
+ *[[0-9]]* ) ;;
+ * ) my_os="${my_os}`uname -r`" ;;
+esac
eval `dnl
- [echo "$host_os.$uname_r" | \
+ [echo "$my_os" | \
sed -e 's/^[^0-9]*\([0-9][0-9.]*\).*$/\1/' | \
sed -e 's/^/X/' \
-e
's/^X\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2";
v3="\3"/' \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
