- correct md5

Changed files:
    builder_.sh -> 1.32
    rpm-build-tools.spec -> 1.31

diff --git a/builder_.sh b/builder_.sh
index f9d2db7d59e807f495a26f6c7307a050f2c8b6c8..e6890684a03c68779db92ae43a61bdaf6d66863b 100644 (file)
--- a/builder_.sh
+++ b/builder_.sh
@@ -19,7 +19,6 @@
 #      100 - Unknown error (should not happen)
 
 # Notes (todo/bugs):
-# - builder -u fetches current version first (well that's okay, how you compare versions if you have no old spec?)
 # - when Icon: field is present, -5 and -a5 doesn't work
 # - builder -R skips installing BR if spec is not present before builder invocation (need to run builder twice)
 # - does not respect NoSource: X, and tries to cvs up such files [ example: VirtualBox-bin.spec and its Source0 ]
@@ -466,6 +465,7 @@ minirpm() {
 %pyrequires_eq() %{nil}
 %requires_eq() %{nil}
 %requires_eq_to() %{nil}
+%requires_ge() %{nil}
 %releq_kernel_up(n:) ERROR
 %releq_kernel_smp(n:) ERROR
 %releq_kernel(n:) ERROR
@@ -738,7 +738,7 @@ get_spec() {
 
                        # create symlinks for tools
                        if [ "$SYMLINK_TOOLS" != "no" ]; then
-                               for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh; do
+                               for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh pldnotify.awk; do
                                        [ -f $a ] || continue
                                        ln -s ../$a $ASSUMED_NAME
                                        cvsignore_df $a
@@ -1412,19 +1412,13 @@ set_version() {
        " $specfile
 }
 
-build_package() {
-       update_shell_title "build_package"
-       if [ -n "$DEBUG" ]; then
-               set -x
-               set -v
-       fi
-
-       cd "$PACKAGE_DIR"
-
+try_upgrade() {
        if [ -n "$TRY_UPGRADE" ]; then
                local TNOTIFY TNEWVER TOLDVER
                update_shell_title "build_package: try_upgrade"
 
+               cd "$PACKAGE_DIR"
+               
                if [ -n "$FLOAT_VERSION" ]; then
                        TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE -n) || exit 1
                else
@@ -1440,13 +1434,22 @@ build_package() {
                                cp -f $SPECFILE $SPECFILE.bak
                        fi
                        chmod +w $SPECFILE
-                       set_release $SPECFILE $PACKAGE_RELEASE 0.1
+                       set_release $SPECFILE $PACKAGE_RELEASE 1
                        set_version $SPECFILE $PACKAGE_VERSION $TNEWVER
                        parse_spec
-                       NODIST="yes" get_files $SOURCES $PATCHES
-                       update_md5 $SOURCES
+                       return 1
                fi
        fi
+       return 0
+}
+
+build_package() {
+       update_shell_title "build_package"
+       if [ -n "$DEBUG" ]; then
+               set -x
+               set -v
+       fi
+
        cd "$PACKAGE_DIR"
 
        case "$COMMAND" in
@@ -1496,10 +1499,12 @@ build_package() {
        fi
        if [ "$RETVAL" -ne "0" ]; then
                if [ -n "$TRY_UPGRADE" ]; then
-                       echo "\n!!! Package with new version cannot be built automagically\n"
+                       echo "\nUpgrade package to new version failed."
                        if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
+                               echo "Restoring old spec file."
                                mv -f $SPECFILE.bak $SPECFILE
                        fi
+                       echo ""
                fi
                Exit_error err_build_fail
        fi
@@ -2438,8 +2443,17 @@ case "$COMMAND" in
                        if [ -n "$NOSOURCE0" ] ; then
                                SOURCES=`echo $SOURCES | xargs | sed -e 's/[^ ]*//'`
                        fi
-                       get_files $SOURCES $PATCHES
-                       check_md5 $SOURCES
+                       try_upgrade
+                       case $? in
+                               0)
+                                       get_files $SOURCES $PATCHES
+                                       check_md5 $SOURCES
+                                       ;;
+                               *)
+                                       NODIST="yes" get_files $SOURCES $PATCHES
+                                       update_md5 $SOURCES
+                                       ;;
+                       esac
                        build_package
                        if [ "$UPDATE_POLDEK_INDEXES" = "yes" -a "$COMMAND" != "build-prep" ]; then
                                run_poldek --sdir="${POLDEK_INDEX_DIR}" --mkidxz

diff --git a/rpm-build-tools.spec b/rpm-build-tools.spec
index 3f8816a2acf4b129db2e13a4fac0e9da59f0fbc5..ff1833a54896fe9d2864b137485fa9ee3c19c741 100644 (file)
--- a/rpm-build-tools.spec
+++ b/rpm-build-tools.spec
@@ -12,7 +12,7 @@ License:      GPL
 Group:         Applications/File
 Group:         Base
 Source0:       http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/builder?rev=%{builder_ver}#/builder.sh
-# Source0-md5: 3e9000561e11bd2385ac14880e45db12
+# Source0-md5: bc6163cd6dd40cc394c57e3805629fba
 Source1:       adapter.awk
 Source2:       adapter.sh
 Source3:       pldnotify.awk