1) fixed --nomd5 parsing

2) updated configure.in find-req and find-prov checks

CVS patchset: 2068
CVS date: 1998/04/03 16:33:19

diff --git a/CHANGES b/CHANGES
index 378dd9d..8c569ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2.4.106 -> 2.4.107:
+       - --nomd5 wasn't handled properly
+       - updated configure.in find-req and find-prov checks (Tim Mooney)
+
 2.4.105 -> 2.4.106:
        - build: inly check for non-printables in first 128 chars
        - added %triggerpostun

diff --git a/configure.in b/configure.in
index 9dfb1ef..041d47a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -476,12 +476,6 @@ if test "x$tmpdir" = "x"; then
     fi
 fi
 
-# Solaris 2.5.1 seems to confuse things
-if echo "$build" | grep "solaris2.5" > /dev/null ; then
-       echo "Hacking things up for Solaris 2.5.x"
-       build_os="solaris"
-fi
-
 RPM=rpm
 # Solaris needs -ldl to use -lnsl, and it can't build static
 # binaries if you use -ldl
@@ -513,24 +507,48 @@ elif echo "$build_os" | grep aix > /dev/null; then
        echo "hacking things up for aix"
 fi
 
+#
+# get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
+#
+if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
+       build_os=`echo "${build_os}" | sed 's/-gnu$//'`
+fi
+
+build_os_exact="${build_os}"
+build_os_major=`echo "${build_os}" | sed 's/\..*$//'`
+build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'`
+
 rm -f ./find-provides.sh
-if test -f ${srcdir}/autodeps/${target_os}.prov ; then
-       echo "using ${srcdir}/autodeps/$build_os.prov for automatic provides generation"
-       ln -s ${srcdir}/autodeps/${build_os}.prov ./find-provides.sh
+if test -f ${srcdir}/autodeps/${build_os_exact}.prov ; then
+       echo "using ${srcdir}/autodeps/${build_os_exact}.prov for automatic provides generation"
+    ln -s ${srcdir}/autodeps/${build_os_exact}.prov ./find-provides.sh
+elif test -f ${srcdir}/autodeps/${build_os_major}.prov ; then
+       echo "using ${srcdir}/autodeps/${build_os_major}.prov for automatic provides generation"
+    ln -s ${srcdir}/autodeps/${build_os_major}.prov ./find-provides.sh
+elif test -f ${srcdir}/autodeps/${build_os_noversion}.prov ; then
+       echo "using ${srcdir}/autodeps/${build_os_noversion}.prov for automatic provides generation"
+    ln -s ${srcdir}/autodeps/${build_os_noversion}.prov ./find-provides.sh
 else
-       echo "*** no default provides information is available for $target_os"
-       ln -s ${srcdir}/autodeps/none ./find-provides.sh
+    echo "*** no default provides information is available for ${build_os_noversion}"
+    ln -s ${srcdir}/autodeps/none ./find-provides.sh
 fi
 
 rm -f ./find-requires.sh
-if test -f ${srcdir}/autodeps/${target_os}.req ; then
-       echo "using ${srcdir}/autodeps/$build_os.req for automatic requires generation"
-       ln -s ${srcdir}/autodeps/$build_os.req ./find-requires.sh
+if test -f ${srcdir}/autodeps/${build_os_exact}.req ; then
+       echo "using ${srcdir}/autodeps/${build_os_exact}.req for automatic requires generation"
+    ln -s ${srcdir}/autodeps/${build_os_exact}.req ./find-provides.sh
+elif test -f ${srcdir}/autodeps/${build_os_major}.req ; then
+       echo "using ${srcdir}/autodeps/${build_os_major}.req for automatic requires generation"
+    ln -s ${srcdir}/autodeps/${build_os_major}.req ./find-provides.sh
+elif test -f ${srcdir}/autodeps/${build_os_noversion}.req ; then
+       echo "using ${srcdir}/autodeps/${build_os_noversion}.req for automatic requires generation"
+    ln -s ${srcdir}/autodeps/${build_os_noversion}.req ./find-provides.sh
 else
-       echo "*** no default requires information is available for $target_os"
-       ln -s ${srcdir}/autodeps/none ./find-requires.sh
+    echo "*** no default requires information is available for ${build_os_noversion}"
+    ln -s ${srcdir}/autodeps/none ./find-requires.sh
 fi
 
+
 if test -n "$MISCOBJS" ; then
        MISCDIR=misc
        LIBMISC=-lmisc

diff --git a/rpm.c b/rpm.c
index 6f8da9f..65a8bd8 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -507,7 +507,7 @@ int main(int argc, char ** argv) {
     int buildAmount = 0;
     int showrc = 0;
     int gotDbpath = 0, building = 0, verifyFlags;
-    int noMd5 = 0, rmsource = 0;
+    int rmsource = 0;
     int checksigFlags = 0;
     int timeCheck = 0;
     int addSign = NEW_SIGNATURE;