Merge branch 'checkout_by_date'

diff --git a/TODO b/TODO
index 1de6ad8b6a3550faf8c37469d4abc6e8bf26ba31..5ed8ea32e05b431b066d2b97a9e5db5af3a58826 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 find_mirror - what to do with mirrors file
 
-src_md5 - is it still used
+src_md5:  is it worth to keep additional-md5sums
 
 init_rpm_dir

diff --git a/builder.sh b/builder.sh
index 7713c5ec490dc9f2a98f4fc3beaf8d69c436b7ca..7bf9f2f5873ab2c71c5ca1b3995af0ae4da3eb42 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -840,13 +840,8 @@ src_md5() {
        local md5
 
        if [ -f additional-md5sums ]; then
-               local spec_rev=$(grep $SPECFILE CVS/Entries 2>/dev/null | sed -e s:/$SPECFILE/:: -e s:/.*::)
-               if [ -z "$spec_rev" ]; then
-                       spec_rev=$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')
-               fi
-               local spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
                md5=$(grep -s -v '^#' additional-md5sums | \
-               grep -E "[      ]$(basename "$1")[      ]+${spec}([     ,]|\$)" | \
+               grep -E "[      ]$(basename "$1")([     ,]|\$)" | \
                sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
                grep -E '^[0-9a-f]{32}$')
 
@@ -1930,7 +1925,9 @@ mr_proper() {
 
        # remove spec and sources
        $RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" $SPECFILE
-       rm -rf $PACKAGE_DIR/.git
+       rm -rf $PACKAGE_DIR/.git .gitignore
+       cd $__PWD
+       rmdir --ignore-fail-on-non-empty $PACKAGE_DIR
 }
 
 #---------------------------------------------