makedist: Fix to handle rc releases

Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/makedist b/makedist
index e4f20acf8674c07647559b526fd6442a17c8da3e..0c4b39eba9a90b6a9a91731b1fc7bb792914c1e6 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -44,7 +44,7 @@ else { cat inventory ; echo ANNOUNCE-$version ; } | sort -o inventory
 fi
 
 echo version = $version
 fi
 
 echo version = $version

-base=mdadm-$version.tar.gz
+base=mdadm-$rpmv.tar.gz

 if [ " $arg" != " diff" ]
 then
   if [ -f $target/$base ]
 if [ " $arg" != " diff" ]
 then
   if [ -f $target/$base ]


@@ -53,7 +53,7 @@ then
     exit 1
   fi
   trap "rm $target/$base; exit" 1 2 3
     exit 1
   fi
   trap "rm $target/$base; exit" 1 2 3

-  git archive --prefix=mdadm-$version/ HEAD | gzip --best > $target/$base
+  git archive --prefix=mdadm-$rpmv/ HEAD | gzip --best > $target/$base

   chmod a+r $target/$base
   ls -l $target/$base
   if tar tzf $target/$base | sed 's,[^/]*/,,' | sort | diff -u inventory -
   chmod a+r $target/$base
   ls -l $target/$base
   if tar tzf $target/$base | sed 's,[^/]*/,,' | sort | diff -u inventory -


@@ -63,7 +63,7 @@ then
        exit 1
   fi
   rpmbuild -ta $target/$base || exit 1
        exit 1
   fi
   rpmbuild -ta $target/$base || exit 1

-  find /home/neilb/src/RPM -name "*mdadm-$version-*" \
+  find ~/rpmbuild/RPMS -name "*mdadm-$version-*" \

      -exec cp {} $target/RPM \;
   cp ANNOUNCE-$version $target/ANNOUNCE
   cp ChangeLog $target/ChangeLog
      -exec cp {} $target/RPM \;
   cp ANNOUNCE-$version $target/ANNOUNCE
   cp ChangeLog $target/ChangeLog