- może wrescie ktoś wykasuje to konto ?

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

diff --git a/builder.sh b/builder.sh
index 1f25e9bce6407fed02e4b94b2cbd30ae37588f46..385bf7782855c7b28a8dbe250a082db8292899f9 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -3,11 +3,12 @@
 # $Id$
 # Exit codes:
 #      0 - succesful
-#      1 - help dispayed
+#      1 - help displayed
 #      2 - no spec file name in cmdl parameters
 #      3 - spec file not stored in repo
 #      4 - some source, patch or icon files not stored in repo
 #      5 - package build failed
+#      6 - spec file with errors
 
 # Notes (todo):
 #      - builder -u fetches current version first
@@ -50,7 +51,6 @@ LOGDIR=""
 LOGDIROK=""
 LOGDIRFAIL=""
 LASTLOG_FILE=""
-LTAG=""
 CHMOD="no"
 CHMOD_MODE="0444"
 RPMOPTS=""
@@ -113,8 +113,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
        [--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
 
        -5, --update-md5
-                       - update md5 comments in spec, implies -nd
-       -a5, --add-md5  - add md5 comments to URL sources, implies -nc -nd
+                       - update md5 comments in spec, implies -nd -ncs
+       -a5, --add-md5  - add md5 comments to URL sources, implies -nc -nd -ncs
        -D, --debug     - enable script debugging mode,
        -V, --version   - output builder version
        -a, --as_anon   - get files via pserver as cvs@$CVS_SERVER,
@@ -189,15 +189,23 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 "
 }
 
-rpm_dump () {
+cache_rpm_dump () {
+   rpm_dump_cache=`
        case "$RPMBUILD" in
        rpm )
-               rpm -bp --define 'prep %dump' $BCOND $SPECFILE 2>&1 
+               rpm -bp --nodeps --define 'prep %dump' $BCOND $SPECFILE 2>&1 
                ;;
        rpmbuild )
-               rpmbuild --define 'prep %dump' $BCOND $SPECFILE 2>&1 
+               rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1 
                ;;
-       esac
+       esac`
+}
+
+rpm_dump () {
+    if [ -z "$rpm_dump_cache" ] ; then
+        echo "internal error: cache_rpm_dump not called!" 1>&2
+    fi
+    echo "$rpm_dump_cache"
 }
 
 parse_spec()
@@ -208,6 +216,9 @@ parse_spec()
     fi
 
     cd $SPECS_DIR
+
+    cache_rpm_dump
+
     if [ "$NOSRCS" != "yes" ]; then
        SOURCES="`rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}'`"
     fi
@@ -435,6 +446,14 @@ get_files()
            fi
        fi
        for i in $GET_FILES; do
+           if [ -n "$UPDATE5" ]; then
+               if [ -n "$ADD5" ]; then
+                   [ `nourl $i` = "$i" ] && continue
+                   grep -qiE '^#[      ]*Source'$(src_no $i)'-md5[     ]*:' $SPECS_DIR/$SPECFILE && continue
+               else
+                   grep -qiE '^#[      ]*Source'$(src_no $i)'-md5[     ]*:' $SPECS_DIR/$SPECFILE || continue
+               fi
+           fi
            FROM_DISTFILES=0
            if [ ! -f `nourl $i` ] || [ $ALWAYS_CVSUP = "yes" ]; then
                if echo $i | grep -vE '(http|ftp|https|cvs|svn)://' | grep -qE '\.(gz|bz2)$']; then
@@ -459,10 +478,13 @@ get_files()
                            if [ `echo $url | grep -E 'ftp://'` ]; then
                                ${GETURI2} -O "$target" "$url"
                            fi
-                       test -s "$target" || rm -f "$target"
+                       if ! test -s "$target"; then
+                           rm -f "$target"
+                           FROM_DISTFILES=0
+                       fi
                    fi
-               elif [ -z "$(src_md5 "$i")" ] && \
-                    ( [ -z "$NOCVS" ] || echo $i | grep -qvE '(ftp|http|https)://' ); then
+               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
                    retries_counter=0
                    while [ "$result" != "0" -a "$retries_counter" -le "$CVS_RETRIES" ]; do
@@ -684,11 +706,6 @@ build_package()
            BUILD_SWITCH="-bs --nodeps" ;;
     esac
     if [ -n "$LOGFILE" ]; then
-       if [ -n "$CVSTAG" ]; then
-           LTAG="r_`echo $CVSTAG|sed -e 's/\./_/g'`_"
-       else
-           LTAG=""
-       fi
        LOG=`eval echo $LOGFILE`
        if [ -n "$LASTLOG_FILE" ]; then
            echo "LASTLOG=$LOG" > $LASTLOG_FILE
@@ -726,6 +743,7 @@ nourl()
 {
     echo "$@" | sed 's#\<\(ftp\|http\|https\|cvs\|svn\)://[^ ]*/##g'
 }
+
 #---------------------------------------------
 # main()
 
@@ -739,12 +757,14 @@ while test $# -gt 0 ; do
        -5 | --update-md5 )
            COMMAND="get";
            NODIST="yes"
+           NOCVSSPEC="yes"
            UPDATE5="yes"
            shift ;;
        -a5 | --add-md5 )
            COMMAND="get";
            NODIST="yes"
            NOCVS="yes"
+           NOCVSSPEC="yes"
            UPDATE5="yes"
            ADD5="yes"
            shift ;;
@@ -834,10 +854,10 @@ while test $# -gt 0 ; do
            TAG_VERSION="no"
            shift;;
        -U | --update )
+           COMMAND="get"
            UPDATE="yes"
            NODIST="yes"
            UPDATE5="yes"
-           COMMAND="get"
            shift ;;
        -u | --try-upgrade )
            TRY_UPGRADE="1"; shift ;;