- updated from SPECS (HEAD)

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index dfbb595b40bb5d26e53014d1237f547a554f773d..4df57b4be05d85ce42e3d96072eba1e4b6e454c7 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -91,11 +91,11 @@ GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
 GETLOCAL="cp -a"
 
 if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
-    RPM="rpm"
-    RPMBUILD="rpm"
+       RPM="rpm"
+       RPMBUILD="rpm"
 else
-    RPM="rpm"
-    RPMBUILD="rpmbuild"
+       RPM="rpm"
+       RPMBUILD="rpmbuild"
 fi
 
 POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/"
@@ -107,7 +107,7 @@ POLDEK_CMD="/usr/bin/poldek"
 # in command line.
 # This one reads global system environment settings:
 if [ -f ~/etc/builderrc ]; then
-    . ~/etc/builderrc
+       . ~/etc/builderrc
 fi
 # And this one cascades settings using user personal
 # builder settings.
@@ -291,9 +291,9 @@ parse_spec()
 
        PATCHES="`rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}'`"
        ICONS="`awk '/^Icon:/ {print $2}' ${SPECFILE}`"
-       PACKAGE_NAME="`$RPM -q --qf '%{NAME}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
-       PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -1`"
-       PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -1`"
+       PACKAGE_NAME="`$RPM -q --qf '%{NAME}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`"
+       PACKAGE_VERSION="`$RPM -q --qf '%{VERSION}\n' --specfile ${SPECFILE} 2> /dev/null| head -n 1`"
+       PACKAGE_RELEASE="`$RPM -q --qf '%{RELEASE}\n' --specfile ${SPECFILE} 2> /dev/null | head -n 1`"
 
        if [ -n "$BE_VERBOSE" ]; then
                echo "- Sources :  `nourl $SOURCES`"
@@ -444,7 +444,7 @@ src_no ()
        rpm_dump | \
        grep "SOURCEURL[0-9]*[  ]*$1""[         ]*$" | \
        sed -e 's/.*SOURCEURL\([0-9][0-9]*\).*/\1/' | \
-       head -1 | xargs
+       head -n 1 | xargs
 }
 
 src_md5 ()
@@ -454,7 +454,7 @@ src_md5 ()
        cd $SPECS_DIR
        spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::)
        if [ -z "$spec_rev" ]; then
-               spec_rev="$(head -1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
+               spec_rev="$(head -n 1 $SPECFILE | sed -e 's/.*\$Revision: \([0-9.]*\).*/\1/')"
        fi
        spec="$SPECFILE[0-9.,]*,$(echo $spec_rev | sed 's/\./\\./g')"
        md5=$(grep -s -v '^#' additional-md5sums | \
@@ -467,7 +467,7 @@ src_md5 ()
                if [ $(echo "$md5" | wc -l) != 1 ] ; then
                        echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
                fi
-               echo "$md5" | tail -1
+               echo "$md5" | tail -n 1
        fi
 }
 
@@ -476,6 +476,11 @@ distfiles_url ()
        echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
 }
 
+distfiles_attic_url ()
+{
+       echo "$PROTOCOL$DISTFILES_SERVER/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+}
+
 good_md5 ()
 {
        md5=$(src_md5 "$1")
@@ -537,10 +542,11 @@ get_files()
                                        fi
                                        target=$(nourl "$i")
                                        url=$(distfiles_url "$i")
+                                       url_attic=$(distfiles_attic_url "$i")
+                                       FROM_DISTFILES=1
                                        if [ `echo $url | grep -E '^(\.|/)'` ]; then
                                                ${GETLOCAL} $url $target
                                        else
-                                               FROM_DISTFILES=1
                                                if [ -z "$NOMIRRORS" ]; then
                                                        url="`find_mirror "$url"`"
                                                fi
@@ -548,11 +554,25 @@ get_files()
                                                if [ `echo $url | grep -E 'ftp://'` ]; then
                                                        ${GETURI2} -O "$target" "$url"
                                                fi
-                                               if ! test -s "$target"; then
-                                                       rm -f "$target"
-                                                       FROM_DISTFILES=0
+                                       fi
+                                       if ! test -s "$target"; then
+                                               rm -f "$target"
+                                               if [ `echo $url_attic | grep -E '^(\.|/)'` ]; then
+                                                       ${GETLOCAL} $url_attic $target
+                                               else
+                                                       if [ -z "$NOMIRRORS" ]; then
+                                                               url_attic="`find_mirror "$url_attic"`"
+                                                       fi
+                                                       ${GETURI} -O "$target" "$url_attic" || \
+                                                       if [ `echo $url_attic | grep -E 'ftp://'` ]; then
+                                                               ${GETURI2} -O "$target" "$url_attic"
+                                                       fi
                                                fi
                                        fi
+                                       if ! test -s "$target"; then
+                                               rm -f "$target"
+                                               FROM_DISTFILES=0
+                                       fi
                                elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
                                        # ( echo $i | grep -qvE '(ftp|http|https)://' ); -- if CVS should be used, but URLs preferred
                                        result=1
@@ -572,7 +592,7 @@ get_files()
                                                fi
                                        done
                                fi
-       
+
                                if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
                                        if [ -z "$NOMIRRORS" ]; then
                                                im="`find_mirror "$i"`"
@@ -585,7 +605,6 @@ get_files()
                                        fi
                                fi
 
-
                        fi
                        srcno=$(src_no $i)
                        if [ ! -f "`nourl $i`" -a "$FAIL_IF_NO_SOURCES" != "no" ]; then
@@ -617,6 +636,13 @@ get_files()
                                if [ `echo $url | grep -E 'ftp://'` ]; then
                                        ${GETURI2} -O "$target" "$url"
                                fi
+                               if ! test -s "$target"; then
+                                       rm -f "$target"
+                                       ${GETURI} -O "$target" "$url_attic" || \
+                                       if [ `echo $url_attic | grep -E 'ftp://'` ]; then
+                                               ${GETURI2} -O "$target" "$url_attic"
+                                       fi
+                               fi
                                test -s "$target" || rm -f "$target"
                        fi
 
@@ -674,8 +700,8 @@ tag_files()
                cd $SOURCE_DIR
                for i in $TAG_FILES
                do
-                       # don't tag non cvs files (ie. stored on distfiles)
-                       [ "`nourl $i`" != "$i" ] && continue
+                       # don't tag files stored on distfiles
+                       [ -n "`src_md5 $i`" ] && continue
                        if [ -f "`nourl $i`" ]; then
                                if [ "$TAG_VERSION" = "yes" ]; then
                                        cvs $OPTIONS $TAGVER `nourl $i`
@@ -1368,6 +1394,8 @@ case "$COMMAND" in
                fi
                ;;
        "tag" )
+               NOURLS=1
+               NODIST=1
                init_builder;
                if [ -n "$SPECFILE" ]; then
                        get_spec;
@@ -1380,7 +1408,7 @@ case "$COMMAND" in
                        new_SOURCES=""
                        for file in $SOURCES
                        do
-                               [ "`nourl $file`" != "$file" ] && continue
+                               [ -n "`src_md5 $file`" ] && continue
                                new_SOURCES="$new_SOURCES $file"
                        done
                        SOURCES="$new_SOURCES"