Changeset 715 for trunk/technical

Timestamp:

Apr 3, 2006, 3:12:31 PM (19 years ago)

Author:

joergs

Message:

better determination of RPM PACKAGE Name and Version

File:

• trunk/technical/common/build/build.sh (modified) (1 diff)

trunk/technical/common/build/build.sh

@@ -105 +105 @@
         PACKAGE=$(awk '/^Name:/ {print $2}' <$SPECFILE)
         VERSION=$(awk '/^Version:/ {print $2}' <$SPECFILE)
-else
+elif [ -r "$1" ]; then
         # parameter is src.rpm file
-        PACKAGE=`echo $1 | sed 's/-[0-9]*\..*.src.rpm//'`
-        VERSION=`echo $1 | sed 's/.*-\([0-9]*\..*\)-.*.src.rpm/\1/'`
+        PACKAGE=`rpm -qp --qf "%{NAME}" $1`
+        VERSION=`rpm -qp --qf "%{VERSION}" $1`
 fi
 
 echo $PACKAGE $VERSION $BUILD_DIST $BUILD_MODE
+
+if [ -z "$PACKAGE" ]; then
+    echo "nothing to build found!"
+    exit 1
+fi
+
+
 
 rm -rf ${BUILDTEMP}/src/${PACKAGE};