]> git.pld-linux.org Git - packages/rpm-build-tools.git/blobdiff - builder.sh
- BuildConflicts after BuildRequires
[packages/rpm-build-tools.git] / builder.sh
index b907ce0c3baed64a1ac7666b43edf7a4713793bf..5eacb84efd52e8875d2f062c1b1670222664dac2 100644 (file)
 #      100 - Unknown error (should not happen)
 
 # Notes (todo):
-#      - builder -u fetches current version first
-#      - tries to get new version from distfiles without new md5
-#      - after fetching new version doesn't update md5
-#      - doesn't get sources for specs with %include /usr/lib/rpm/macros.python
-#        when there's no rpm-pythonprov (rpm's fault, but it's ugly anyway)
-#      - as above with %include /usr/lib/rpm/macros.perl and no rpm-perlprov
+#      - 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)
 
 VERSION="\
-Build package utility from PLD CVS repository
-V 0.11 (C) 1999-2004 Free Penguins".
+Build package utility from PLD Linux CVS repository
+V 0.13 (C) 1999-2005 Free Penguins".
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
 COMMAND="build"
@@ -90,25 +86,12 @@ DEF_NICE_LEVEL=19
 
 FAIL_IF_NO_SOURCES="yes"
 
-wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet"
-wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
-
-GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
-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"
+if [ -x /usr/bin/rpm-getdeps ]; then
+        FETCH_BUILD_REQUIRES_RPMGETDEPS="yes"
 else
-       RPM="rpm"
-       RPMBUILD="rpmbuild"
+        FETCH_BUILD_REQUIRES_RPMGETDEPS="no"
 fi
 
-POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/"
-POLDEK_SOURCE="cvs"
-POLDEK_CMD="/usr/bin/poldek --noask"
-
 # Here we load saved user environment used to
 # predefine options set above, or passed to builder
 # in command line.
@@ -126,6 +109,7 @@ fi
 #GROUP_BCONDS="yes"
 #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE'
 #
+SU_SUDO=""
 if [ -n "$HOME_ETC" ]; then
        USER_CFG="$HOME_ETC/.builderrc"
 else
@@ -134,6 +118,38 @@ fi
 
 [ -f "$USER_CFG" ] && . "$USER_CFG"
 
+wget --help 2>&1 | grep -q ' \-\-no-check\-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
+
+if [ -n "$USE_PROZILLA" ]; then
+       GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS"
+       GETURI2="$GETURI"
+       OUTFILEOPT="-O"
+elif [ -n "$USE_AXEL" ]; then
+       GETURI="axel -a $AXEL_OPTS"
+       GETURI2="$GETURI"
+       OUTFILEOPT="-o"
+else
+       wget --help 2>&1 | grep -q ' \-\-inet ' && WGET_OPTS="$WGET_OPTS --inet"
+       wget --help 2>&1 | grep -q ' \-\-retry\-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+
+       GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
+       GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
+       OUTFILEOPT="-O"
+fi
+
+GETLOCAL="cp -a"
+
+if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
+       RPM="rpm"
+       RPMBUILD="rpm"
+else
+       RPM="rpm"
+       RPMBUILD="rpmbuild"
+fi
+
+POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/"
+POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask"
+
 run_poldek()
 {
        RES_FILE=~/tmp/poldek-exit-status.$RANDOM
@@ -142,7 +158,7 @@ run_poldek()
                if [ -n "$LASTLOG_FILE" ]; then
                        echo "LASTLOG=$LOG" > $LASTLOG_FILE
                fi
-               (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee $LOG
+               (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG
                return $exit_pldk
        else
                (nice -n ${DEF_NICE_LEVEL} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null
@@ -151,17 +167,6 @@ run_poldek()
        fi
 }
 
-# Example grep cvs /etc/poldek.conf:
-# source = cvs /home/users/yoshi/rpm/RPMS/
-if [ "$UPDATE_POLDEK_INDEXES" = "yes" ]; then
-       run_poldek -l -n ${POLDEK_SOURCE} 1>&2 > /dev/null
-       if [ ! "$?" == "0" ]; then
-               echo "Using improper source '${POLDEK_SOURCE}' in /etc/poldek.conf"
-               echo "Fix it and try to continue"
-               exit 7
-       fi
-fi
-
 #---------------------------------------------
 # functions
 
@@ -178,22 +183,26 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 [-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest]
 [-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
 [{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
-[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
+[-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>] [--show-bconds]
 [--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
 
 -5, --update-md5    - update md5 comments in spec, implies -nd -ncs
 -a5, --add-md5      - add md5 comments to URL sources, implies -nc -nd -ncs
 -n5, --no-md5       - ignore md5 comments in spec
--D, --debug         - enable script debugging mode,
+-D, --debug         - enable builder script debugging mode,
+-debug              - produce rpm debug package (same as --opts -debug)
 -V, --version       - output builder version
 -a, --as_anon       - get files via pserver as cvs@$CVS_SERVER,
 -b, -ba, --build    - get all files from CVS repo or HTTP/FTP and build package
                       from <package>.spec,
 -bb, --build-binary - get all files from CVS repo or HTTP/FTP and build binary
                       only package from <package>.spec,
+-bp, --build-prep   - execute the %prep phase of <package>.spec,
+-bc                 - reserved (not implemented)
+-bi                   reserved (not implemented)
 -bs, --build-source - get all files from CVS repo or HTTP/FTP and only pack
                       them into src.rpm,
--bp, --build-prep   - execute the %prep phase of <package>.spec,
+--short-circuit     - reserved (not implemented)
 -B, --branch        - add branch
 -c, --clean         - clean all temporarily created files (in BUILD, SOURCES,
                       SPECS and \$RPM_BUILD_ROOT),
@@ -232,18 +241,26 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -FRB, --force-remove-build-requires
                     - remove all you fetched with -R or --fetch-build-requires
                       remember, this option works without confirmation,
+-sf, --source-files - list sources - bare filenames (intended for offline
+                      operations; does not work when Icon field is present
+                                                        but icon file is absent),
+-sp, --source-paths - list sources - filenames with full local paths (intended for
+                      offline operations; does not work when Icon field is present
+                                                        but icon file is absent),
+-su, --source-urls  - list urls - urls to sources and patches
+                      intended for copying urls with spec with lots of macros in urls
 -T <cvstag> , --tag <cvstag>
                     - add cvs tag <cvstag> for files,
 -Tvs, --tag-version-stable
-                    - add cvs tags STABLE and NAME-VERSION-RELESE for files,
+                    - add cvs tags STABLE and NAME-VERSION-RELEASE for files,
 -Tvn, --tag-version-nest
-                    - add cvs tags NEST and NAME-VERSION-RELESE for files,
+                    - add cvs tags NEST and NAME-VERSION-RELEASE for files,
 -Ts, --tag-stable
                     - add cvs tag STABLE for files,
 -Tn, --tag-nest
                     - add cvs tag NEST for files,
 -Tv, --tag-version
-                    - add cvs tag NAME-VERSION-RELESE for files,
+                    - add cvs tag NAME-VERSION-RELEASE for files,
 -Tp, --tag-prefix <prefix>
                     - add <prefix> to NAME-VERSION-RELEASE tags,
 -tt, --test-tag <prefix>
@@ -257,6 +274,10 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 -U, --update        - refetch sources, don't use distfiles, and update md5 comments
 -Upi, --update-poldek-indexes
                     - refresh or make poldek package index files.
+-np, --nopatch <patchnumber>
+                    - don't apply <patchnumber>
+--show-bconds       - show available conditional builds, which can be used
+                    - with --with and/or --without switches.
 --with/--without <feature>
                     - conditional build package depending on %_with_<feature>/
                       %_without_<feature> macro switch.  You may now use
@@ -267,18 +288,51 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
 "
 }
 
+update_shell_title() {
+       [ -t 1 ] || return
+       local len=${COLUMNS:-80}
+       local msg=$(echo "$*" | cut -c-$len)
+
+       msg="builder[$SPECFILE] $msg"
+       case "$TERM" in
+               cygwin|xterm*)
+               echo >&2 -ne "\033]1;$msg\007\033]2;$msg\007"
+       ;;
+               screen*)
+               echo >&2 -ne "\033]0;$msg\007"
+       ;;
+       esac
+}
+
+# set TARGET from BuildArch: from SPECFILE
+set_spec_target() {
+        if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
+                 tmp=$(awk '/^BuildArch:/ { print $NF}' $SPECFILE)
+                 if [ "$tmp" ]; then
+                               TARGET="$tmp"
+                               case "$RPMBUILD" in
+                               "rpmbuild")
+                                        TARGET_SWITCH="--target $TARGET" ;;
+                               "rpm")
+                                        TARGET_SWITCH="--target=$TARGET" ;;
+                               esac
+                 fi
+        fi
+}
+
 cache_rpm_dump () {
         if [ -n "$DEBUG" ]; then
                  set -x;
                  set -v;
         fi
+
 rpm_dump_cache=`
        case "$RPMBUILD" in
                rpm )
                        rpm -bp --nodeps --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1
                        ;;
                rpmbuild )
-                       rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $SPECFILE 2>&1
+                       rpmbuild --nodigest --nosignature --define 'prep %dump' $BCOND $TARGET_SWITCH $SPECFILE 2>&1
                        ;;
        esac`
 }
@@ -292,6 +346,7 @@ rpm_dump () {
 
 parse_spec()
 {
+       update_shell_title "parsing specfile"
        if [ -n "$DEBUG" ]; then
                set -x;
                set -v;
@@ -314,9 +369,12 @@ parse_spec()
        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 [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then
-                Exit_error err_no_package_data;
-       fi
+# These variables may be unset after first cache_rpm_dump call
+# (because of not-yet-retrieved icon file)
+#
+#      if [ -z "$PACKAGE_NAME" -o -z "$PACKAGE_VERSION" -o -z "$PACKAGE_RELEASE" ]; then
+#               Exit_error err_no_package_data;
+#      fi
 
        if [ -n "$BE_VERBOSE" ]; then
                echo "- Sources :  `nourl $SOURCES`"
@@ -374,6 +432,10 @@ Exit_error()
                        remove_build_requires
                        echo "Release ${2} not integer and not a snapshot.";
                        exit 10 ;;
+               "err_branch_exists" )
+                       remove_build_requires
+                       echo "Tree branch already exists (${2}).";
+                       exit 11 ;;
 
        esac
    echo "Unknown error."
@@ -395,6 +457,9 @@ init_builder()
 
 get_spec()
 {
+
+       update_shell_title "get_spec"
+
        if [ -n "$DEBUG" ]; then
                set -x;
                set -v;
@@ -453,7 +518,9 @@ get_spec()
                chmod $CHMOD_MODE $SPECFILE
        fi
        unset OPTIONS
-       grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE
+       [ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $SPECFILE
+
+        set_spec_target
 }
 
 find_mirror()
@@ -493,7 +560,7 @@ src_md5 ()
        no=$(src_no "$1")
        [ -z "$no" ] && return
        cd $SPECS_DIR
-       spec_rev=$(grep $SPECFILE CVS/Entries | sed -e s:/$SPECFILE/:: -e s:/.*::)
+       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
@@ -503,7 +570,17 @@ src_md5 ()
        sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
        grep -E '^[0-9a-f]{32}$')
        if [ X"$md5" = X"" ] ; then
-               grep -i "#[     ]*Source$no-md5[        ]*:" $SPECFILE | sed -e 's/.*://' | xargs
+               source_md5=`grep -i "#[         ]*Source$no-md5[        ]*:" $SPECFILE | sed -e 's/.*://'`
+               if [ ! -z "$source_md5" ] ; then
+                       echo $source_md5;
+               else
+                       # we have empty SourceX-md5, but it is still possible
+                       # that we have NoSourceX-md5 AND NoSource: X
+                       nosource_md5=`grep -i "#[        ]*NoSource$no-md5[      ]*:" $SPECFILE | sed -e 's/.*://'`
+                       if [ ! -z "$nosource_md5" -a ! X"`grep -i "^NoSource:[   ]*$no$" $SPECFILE`" = X"" ] ; then
+                               echo $nosource_md5;
+                       fi;
+               fi;
        else
                if [ $(echo "$md5" | wc -l) != 1 ] ; then
                        echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
@@ -514,12 +591,12 @@ src_md5 ()
 
 distfiles_url ()
 {
-       echo "$PROTOCOL$DISTFILES_SERVER/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+       echo "$PROTOCOL$DISTFILES_SERVER/distfiles/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
 }
 
 distfiles_attic_url ()
 {
-       echo "$PROTOCOL$ATTICDISTFILES_SERVER/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
+       echo "$PROTOCOL$ATTICDISTFILES_SERVER/distfiles/Attic/by-md5/$(src_md5 "$1" | sed -e 's|^\(.\)\(.\)|\1/\2/&|')/$(basename "$1")"
 }
 
 good_md5 ()
@@ -549,6 +626,7 @@ cvsignore_df ()
 get_files()
 {
        GET_FILES="$@"
+       update_shell_title "fetching sources"
 
        if [ -n "$DEBUG" ]; then
                set -x;
@@ -602,28 +680,34 @@ get_files()
                                        url=$(distfiles_url "$i")
                                        url_attic=$(distfiles_attic_url "$i")
                                        FROM_DISTFILES=1
-                                       if [ `echo $url | grep -E '^(\.|/)'` ]; then
+                                       if [ "`echo $url | grep -E '^(\.|/)'`" ]; then
+                                               update_shell_title "get_files: $url"
                                                ${GETLOCAL} $url $target
                                        else
                                                if [ -z "$NOMIRRORS" ]; then
                                                        url="`find_mirror "$url"`"
                                                fi
-                                               ${GETURI} -O "$target" "$url" || \
-                                               if [ `echo $url | grep -E 'ftp://'` ]; then
-                                                       ${GETURI2} -O "$target" "$url"
+                                               update_shell_title "get_files: $url"
+                                               ${GETURI} ${OUTFILEOPT} "$target" "$url" || \
+                                               if [ "`echo $url | grep -E 'ftp://'`" ]; then
+                                                       update_shell_title "get_files: $url"
+                                                       ${GETURI2} ${OUTFILEOPT} "$target" "$url"
                                                fi
                                        fi
                                        if ! test -s "$target"; then
                                                rm -f "$target"
                                                if [ `echo $url_attic | grep -E '^(\.|/)'` ]; then
+                                                       update_shell_title "get_files: $url_attic"
                                                        ${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"
+                                                       update_shell_title "get_files: $url_attic"
+                                                       ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
+                                                       if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
+                                                                update_shell_title "get_files: $url_attic"
+                                                               ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
                                                        fi
                                                fi
                                        fi
@@ -653,16 +737,18 @@ get_files()
                                        done
                                fi
 
-                               if [ -z "$NOURLS" ] && [ ! -f "`nourl $i`" -o -n "$UPDATE" ] && [ `echo $i | grep -E 'ftp://|http://|https://'` ]; then
+                               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"`"
                                        else
                                                im="$i"
                                        fi
+                                       update_shell_title "get_files: $im"
                                        ${GETURI} "$im" || \
-                                       if [ `echo $im | grep -E 'ftp://'` ]; then
+                                       if [ "`echo $im | grep -E 'ftp://'`" ]; then
+                                                update_shell_title "get_files: $im"
                                                ${GETURI2} "$im"
-                                       fi
+                                       fi
                                fi
 
                        fi
@@ -692,15 +778,19 @@ get_files()
                                echo "MD5 sum mismatch. Trying full fetch."
                                FROM_DISTFILES=2
                                rm -f $target
-                               ${GETURI} -O "$target" "$url" || \
-                               if [ `echo $url | grep -E 'ftp://'` ]; then
-                                       ${GETURI2} -O "$target" "$url"
+                               update_shell_title "get_files: $url"
+                               ${GETURI} ${OUTFILEOPT} "$target" "$url" || \
+                               if [ "`echo $url | grep -E 'ftp://'`" ]; then
+                                        update_shell_title "get_files: $url"
+                                       ${GETURI2} ${OUTFILEOPT} "$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"
+                                       update_shell_title "get_files: $url_attic"
+                                       ${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
+                                       if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
+                                                update_shell_title "get_files: $url_attic"
+                                               ${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
                                        fi
                                fi
                                test -s "$target" || rm -f "$target"
@@ -838,6 +928,7 @@ branch_files()
 
 build_package()
 {
+       update_shell_title "build_package"
        if [ -n "$DEBUG" ]; then
                set -x;
                set -v;
@@ -846,10 +937,11 @@ build_package()
        cd "$SPECS_DIR"
 
        if [ -n "$TRY_UPGRADE" ]; then
+                 update_shell_title "build_package: try_upgrade"
                if [ -n "$FLOAT_VERSION" ]; then
-                       TNOTIFY=`./pldnotify.awk $SPECFILE -n`
+                       TNOTIFY=`./pldnotify.awk $SPECFILE -n` || exit 1
                else
-                       TNOTIFY=`./pldnotify.awk $SPECFILE`
+                       TNOTIFY=`./pldnotify.awk $SPECFILE` || exit 1
                fi
 
                TNEWVER=`echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }'`
@@ -860,9 +952,13 @@ build_package()
                        cp -f $SPECFILE $SPECFILE.bak
                        chmod +w $SPECFILE
                        eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
-                       eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t1/' $SPECFILE"
+                       eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE"
                        parse_spec;
-                       get_files "$SOURCES $PATCHES";
+                       if [ -n "$ICONS" ]; then
+                               get_files $ICONS;
+                               parse_spec;
+                       fi
+                       NODIST="yes" UPDATE5="yes" get_files "$SOURCES $PATCHES";
                        unset TOLDVER TNEWVER TNOTIFY
                fi
        fi
@@ -878,6 +974,8 @@ build_package()
                build-prep )
                        BUILD_SWITCH="-bp --nodeps" ;;
        esac
+
+       update_shell_title "build_package: $COMMAND"
        if [ -n "$LOGFILE" ]; then
                LOG=`eval echo $LOGFILE`
                if [ -d "$LOG" ]; then
@@ -889,7 +987,7 @@ build_package()
                        echo "LASTLOG=$LOG" > $LASTLOG_FILE
                fi
                RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-               (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+               (time eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
                RETVAL=`cat $RES_FILE`
                rm $RES_FILE
                if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -926,6 +1024,8 @@ install_required_packages()
 
 set_bconds_values()
 {
+       update_shell_title "set bcond values"
+
        AVAIL_BCONDS_WITHOUT=""
        AVAIL_BCONDS_WITH=""
        if `grep -q ^%bcond ${SPECFILE}`; then
@@ -935,11 +1035,52 @@ set_bconds_values()
        else
                BCOND_VERSION="NONE"
        fi
+
+       # expand bconds from ~/.bcondrc
+       # The file structure is like gentoo's package.use:
+       # ---
+       # * -selinux
+       # samba -mysql -pgsql
+       # w32codec-installer license_agreement
+       # php +mysqli
+       # ---
+       if [ "${BCOND_VERSION}" != "NONE" ] && ( [ -f $HOME/.bcondrc ] || ( [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] ) ) ; then
+               # This takes package name, first defined in spec.
+               # so consider that when defining flags for package.
+               PN=`$RPM -q --qf '%{NAME}\n' --specfile $SPECFILE | head -n 1`
+               SN=${SPECFILE%%\.spec}
+               AVAIL=`$RPMBUILD --bcond $SPECFILE`
+
+               BCONDRC=$HOME/.bcondrc
+               [ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ] && BCONDRC=$HOME_ETC/.bcondrc
+
+               while read pkg flags; do
+                       # ignore comments
+                       [[ "$pkg" == \#* ]] && continue
+
+                       # any package or current package?
+                       if [ "$pkg" = "*" ] || [ "$pkg" = "$PN" ] || [ "$pkg" = "$SN" ]; then
+                               for flag in $flags; do
+                                       opt=${flag#[+-]}
+
+                                       # use only flags which are in this package.
+                                       if [[ $AVAIL = *${opt}* ]]; then
+                                               if [[ $flag = -* ]]; then
+                                                       BCOND="$BCOND --without $opt"
+                                               else
+                                                       BCOND="$BCOND --with $opt"
+                                               fi
+                                       fi
+                               done
+                       fi
+               done < $BCONDRC
+       fi
+
        case "${BCOND_VERSION}" in
                 NONE)
-                       :
+                       :
                        ;;
-                OLD)
+               OLD)
                        echo "Warning: This spec has old style bconds. Fix it || die."
                        for opt in `$RPMBUILD --bcond $SPECFILE |grep ^_without_`
                        do
@@ -972,6 +1113,22 @@ set_bconds_values()
                                        _with)
                                                cond_type="with"
                                                ;;
+                                       _without_*)
+                                               AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`"
+                                               if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then
+                                                       AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$AVAIL_BCOND_WITHOUT>"
+                                               else
+                                                       AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT"
+                                               fi
+                                               ;;
+                                       _with_*)
+                                               AVAIL_BCOND_WITH="`echo $opt | sed 's/^_with_//g'`"
+                                               if `echo $BCOND|grep -q -- "--with $AVAIL_BCOND_WITH"`;then
+                                                       AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$AVAIL_BCOND_WITH>"
+                                               else
+                                                       AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
+                                               fi
+                                               ;;
                                        *)
                                                case "$cond_type" in
                                                        with)
@@ -982,7 +1139,7 @@ set_bconds_values()
                                                                else
                                                                        AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
                                                                fi
-                                                               ;;
+                                                               ;;
                                                        without)
                                                                cond_type=''
                                                                AVAIL_BCOND_WITHOUT="$opt"
@@ -1003,7 +1160,7 @@ set_bconds_values()
 run_sub_builder()
 {
        package_name="${1}"
-       echo -ne "Package installation failed:\t$package_name\n"
+       update_shell_title "run_sub_builder $package_name"
        #
        # No i tutaj bym chcia³ zrobiæ sztuczn± inteligencjê, która spróbuje tego
        # pakieta zbudowaæ. Aktualnie niewiele dziala, bo generalnie nie widze do
@@ -1019,10 +1176,10 @@ run_sub_builder()
        parent_spec_name=''
 
        # Istnieje taki spec? ${package}.spec
-       if [ -f "${SPECS_DIR}${package}.spec" ]; then
+       if [ -f "${SPECS_DIR}/${package}.spec" ]; then
                parent_spec_name=${package}.spec
-       elif [ -f "${SPECS_DIR}`echo ${package_name}|sed -e s,-devel.*,,g -e s,-static,,g`.spec" ]; then
-               parent_spec_name="`echo ${package_name}|sed -e s,-devel.*,,g -e s,-static,,g`.spec"
+       elif [ -f "${SPECS_DIR}/`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec" ]; then
+               parent_spec_name="`echo ${package_name} | sed -e s,-devel.*,,g -e s,-static,,g`.spec"
        else
                for provides_line in `grep ^Provides:.*$package  ${SPECS_DIR} -R`
                do
@@ -1031,24 +1188,33 @@ run_sub_builder()
        fi
 
        if [ "${parent_spec_name}" != "" ]; then
-               sub_builder_opts=''
-               if [ "${FETCH_BUILD_REQUIRES}" == "yes" ]; then
-                       sub_builder_opts="${sub_builder_opts} -R"
-               fi
-               if [ "${REMOVE_BUILD_REQUIRES}" == "nice" ]; then
-                       sub_builder_opts="${sub_builder_opts} -RB"
-               elif [ "${REMOVE_BUILD_REQUIRES}" == "force" ]; then
-                       sub_builder_opts="${sub_builder_opts} -FRB"
-               fi
-               if [ "${UPDATE_POLDEK_INDEXES}" == "yes" ]; then
-                       sub_builder_opts="${sub_builder_opts} -Upi"
-               fi
-               cd "${SPECS_DIR}"
-               ./builder ${sub_builder_opts} ${parent_spec_name}
+               spawn_sub_builder $parent_spec_name
        fi
        NOT_INSTALLED_PACKAGES="$NOT_INSTALLED_PACKAGES $package_name"
 }
 
+spawn_sub_builder()
+{
+        package_name="${1}"
+        update_shell_title "spawn_sub_builder $package_name"
+
+        sub_builder_opts=''
+        if [ "${FETCH_BUILD_REQUIRES}" == "yes" ]; then
+                 sub_builder_opts="${sub_builder_opts} -R"
+        fi
+        if [ "${REMOVE_BUILD_REQUIRES}" == "nice" ]; then
+                 sub_builder_opts="${sub_builder_opts} -RB"
+        elif [ "${REMOVE_BUILD_REQUIRES}" == "force" ]; then
+                 sub_builder_opts="${sub_builder_opts} -FRB"
+        fi
+        if [ "${UPDATE_POLDEK_INDEXES}" == "yes" ]; then
+                 sub_builder_opts="${sub_builder_opts} -Upi"
+        fi
+
+        cd "${SPECS_DIR}"
+        ./builder ${sub_builder_opts} "$@"
+}
+
 remove_build_requires()
 {
        if [ "$INSTALLED_PACKAGES" != "" ]; then
@@ -1082,24 +1248,89 @@ display_bconds()
        fi
 }
 
+display_branches()
+{
+        if [ "$NOCVSSPEC" != "yes" ]; then
+                 echo -ne "Available branches: "
+                 cvs status -v "${SPECFILE}" | awk '!/Sticky Tag:/ && /\(branch:/ { print $1 } ' | xargs
+        fi
+}
+
+# checks a given list of packages/files/provides agains current rpmdb.
+# outputs all dependencies whcih current rpmdb doesn't satisfy.
+# input can be either STDIN or parameters
+_rpm_prov_check()
+{
+        local DEPS
+
+        if [ "$#" -gt 0 ]; then
+                 DEPS="$@"
+        else
+                 DEPS=$(cat)
+        fi
+
+        DEPS=$(rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
+
+        # packages
+        echo "$DEPS" | awk '/^no package provides/ { print $NF }'
+
+        # other deps (files)
+        echo "$DEPS" | awk -F: '/^error:.*No such file/{o = $2; gsub("^ file ", "", o); print o}'
+}
+
+# checks if given package/files/provides exists in rpmdb.
+# inout can be either stdin or parameters
+# returns packages wchi hare present in the rpmdb
+_rpm_cnfl_check()
+{
+        local DEPS
+
+        if [ "$#" -gt 0 ]; then
+                 DEPS="$@"
+        else
+                 DEPS=$(cat)
+        fi
+
+        rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+}
+
 fetch_build_requires()
 {
        if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
+               update_shell_title "fetch build requires"
                if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
-                        CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print "@" $3 } ' | xargs)
-                        DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print "@" $3 } ' | xargs)
-                        if [ -n "$CONF" -o -n "$DEPS" ]; then
-                                 /usr/bin/poldek --update; /usr/bin/poldek --upa
-                        fi
-                        if [ -n "$CONF" ]; then
-                                 echo "Trying to uninstall conflicting packages ($CONF):"
-                                 /usr/bin/poldek --noask --nofollow -ev $CONF
-                        fi
-                        if [ -n "$DEPS" ]; then
-                                 echo "Trying to install dependencies ($DEPS):"
-                                 /usr/bin/poldek --caplookup -uGv $DEPS
-                        fi
-                        return
+                       local CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+                       local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+
+                       update_shell_title "poldek: update indexes"
+                       if [ -n "$CONF" ] || [ -n "$DEPS" ]; then
+                               $SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
+                       fi
+                       if [ -n "$CONF" ]; then
+                               update_shell_title "uninstall conflicting packages: $CONF"
+                               echo "Trying to uninstall conflicting packages ($CONF):"
+                               $SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CONF
+                       fi
+
+                  while [ "$DEPS" ]; do
+                               update_shell_title "install deps: $DEPS"
+                               echo "Trying to install dependencies ($DEPS):"
+                               local log=.${SPECFILE}_poldek.log
+                               $SU_SUDO /usr/bin/poldek --caplookup -uGq $DEPS | tee $log
+                               failed=$(awk -F: '/^error:/{print $2}' $log)
+                               rm -f $log
+                               local ok
+                               if [ -n "$failed" ]; then
+                                        for package in $failed; do
+                                                 # FIXME: sanitise, deps could be not .spec files
+                                                 spawn_sub_builder -bb $package && ok="$ok $package"
+                                        done
+                                        DEPS="$ok"
+                               else
+                                        DEPS=""
+                               fi
+                  done
+                       return
                fi
 
                echo -ne "\nAll packages installed by fetch_build_requires() are written to:\n"
@@ -1107,7 +1338,7 @@ fetch_build_requires()
                echo -ne "\nIf anything fails, you may get rid of them by executing:\n"
                echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`\n\n"
                echo > `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-               for package_item in `cat $SPECFILE|grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g`
+               for package_item in `cat $SPECFILE|grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,textutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g`
                do
                        package_item="`echo $package_item|sed -e s,rpmbuild,rpm-build,g |sed -e s,__perl,perl,g |sed -e s,gasp,binutils-gasp,g -e s,binutils-binutils,binutils,g -e s,apxs,apache,g|sed -e s,apache\(EAPI\)-devel,apache-devel,g -e s,kernel-headers\(netfilter\),kernel-headers,g -e s,awk,mawk,g -e s,mmawk,mawk,g -e s,motif,openmotif,g -e s,openopenmotif,openmotif,g`"
                        GO="yes"
@@ -1126,26 +1357,30 @@ fetch_build_requires()
                                GO=""
                                # %{without}
                                if `echo $COND_TST|grep -q 'without_'`; then
-                                       COND_NAME=`echo $COND_NAME|sed -e s,^.*_without_,,g`
+                                       COND_NAME=`echo $COND_NAME|sed -e s,^.*without_,,g`
                                        if `echo $COND_TST|grep -q !`; then
                                                COND_STATE="with"
                                        else
                                                COND_STATE="wout"
                                        fi
-                                       if `echo $AVAIL_BCONDS_WITHOUT|grep -q "<$COND_NAME>"`; then
+                                       COND_WITH=`echo $AVAIL_BCONDS_WITH|grep "<$COND_NAME>"`
+                                       COND_WITHOUT=`echo $AVAIL_BCONDS_WITHOUT|grep "<$COND_NAME>"`
+                                       if [ -n "$COND_WITHOUT" ] || [ -z "$COND_WITH" ]; then
                                                COND_ARGV="wout"
                                        else
                                                COND_ARGV="with"
                                        fi
                                # %{with}
                                elif `echo $COND_TST|grep -q 'with_'`; then
-                                       COND_NAME=`echo $COND_NAME|sed -e s,^.*_with_,,g`
+                                       COND_NAME=`echo $COND_NAME|sed -e s,^.*with_,,g`
                                        if `echo $COND_TST|grep -q !`; then
                                                COND_STATE="wout"
                                        else
                                                COND_STATE="with"
                                        fi
-                                       if `echo $AVAIL_BCONDS_WITH|grep -q "<$COND_NAME>"`; then
+                                       COND_WITH=`echo $AVAIL_BCONDS_WITH|grep "<$COND_NAME>"`
+                                       COND_WITHOUT=`echo $AVAIL_BCONDS_WITHOUT|grep "<$COND_NAME>"`
+                                       if [ -n "$COND_WITH" ] || [ -z "$COND_WITHOUT" ]; then
                                                COND_ARGV="with"
                                        else
                                                COND_ARGV="wout"
@@ -1189,6 +1424,7 @@ fetch_build_requires()
                                                                        ;;
                                                                *)
                                                                        echo "Attempting to run spawn sub - builder..."
+                                                                       echo -ne "Package installation failed:\t$package_name\n"
                                                                        run_sub_builder $package_name
                                                                        if [ $? -eq 0 ]; then
                                                                                install_required_packages $package_name;
@@ -1208,6 +1444,7 @@ fetch_build_requires()
                                                rm -f ".$package-req.txt"
                                        else
                                                echo "Attempting to run spawn sub - builder..."
+                                               echo -ne "Package installation failed:\t$package\n"
                                                run_sub_builder $package
                                                if [ $? -eq 0 ]; then
                                                        install_required_packages $package;
@@ -1323,7 +1560,9 @@ do
                        NOSRCS="yes"
                        shift;;
                --opts )
-                       shift; RPMOPTS="${1}"; shift ;;
+                       shift; RPMOPTS="$RPM_OPTS ${1}"; shift ;;
+               --nopatch | -np )
+                       shift; RPMOPTS="${RPMOPTS} --define \"patch${1} echo ignoring patch${1} \""; shift ;;
                --with | --without )
                        case $GROUP_BCONDS in
                                "yes")
@@ -1335,7 +1574,14 @@ do
                                                shift
                                        done;;
                                "no")
-                                       BCOND="$BCOND $1 $2" ; shift 2 ;;
+                                       if [[ "$2" = *,* ]]; then
+                                                for a in $(echo "$2" | tr , ' '); do
+                                                         BCOND="$BCOND $1 $a"
+                                                done
+                                       else
+                                                BCOND="$BCOND $1 $2"
+                                       fi
+                                       shift 2 ;;
                        esac
                        ;;
                --target )
@@ -1358,6 +1604,15 @@ do
                -FRB | --force-remove-build-requires)
                        REMOVE_BUILD_REQUIRES="force"
                        shift ;;
+               -sf | --sources-files)
+                       COMMAND="list-sources-files"
+                       shift ;;
+               -sp | --sources-paths)
+                       COMMAND="list-sources-local-paths"
+                       shift ;;
+               -su | --sources-urls)
+                       COMMAND="list-sources-urls"
+                       shift ;;
                -Tvs | --tag-version-stable )
                        COMMAND="tag";
                        TAG="STABLE"
@@ -1421,10 +1676,16 @@ do
                        shift 2
                        RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
                        ;;
+               --show-bconds | -show-bconds | -print-bconds | --print-bconds | -display-bconds | --display-bconds )
+                       SHOW_BCONDS="yes"
+                       shift
+                       ;;
                --nodeps)
                        shift
                        RPMOPTS="${RPMOPTS} --nodeps"
                        ;;
+               -debug)
+                       RPMOPTS="${RPMOPTS} -debug"; shift ;;
                * )
                        SPECFILE="${1}"
                        export PROMPT_COMMAND=`echo -ne "\033]0;${SPECFILE}\007"`
@@ -1446,6 +1707,7 @@ if [ -n "$TARGET" ]; then
        esac
 fi
 
+update_shell_title "$COMMAND"
 case "$COMMAND" in
        "build" | "build-binary" | "build-source" | "build-prep" )
                init_builder;
@@ -1453,6 +1715,8 @@ case "$COMMAND" in
                        get_spec;
                        set_bconds_values;
                        display_bconds;
+                       display_branches;
+                       [ X"$SHOW_BCONDS" = X"yes" ] && exit 0
                        fetch_build_requires;
                        parse_spec;
                        if [ "$INTEGER_RELEASE" = "yes" ]; then
@@ -1469,6 +1733,17 @@ case "$COMMAND" in
                                if [ -n "$TAGREL" ]; then
                                        Exit_error err_tag_exists "$TAGVER" "$TAGREL"
                                fi
+
+                               # - do not allow to build from HEAD when XX-branch exists
+                               TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto-\([a-zA-Z]\+\)-.*#\1#g')
+                               if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
+                                        TAG_BRANCH="${TREE_PREFIX}-branch"
+                                        TAG_STATUS=$(cvs status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)")
+                                        if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then
+                                                 Exit_error err_branch_exists "$TAG_STATUS"
+                                        fi
+
+                               fi
                        fi
 
                        if [ -n "$ICONS" ]; then
@@ -1480,9 +1755,8 @@ case "$COMMAND" in
                        fi
                        get_files "$SOURCES $PATCHES";
                        build_package;
-                       if [ "$UPDATE_POLDEK_INDEXES" = "yes" ]; then
-                               run_poldek --sn ${POLDEK_SOURCE} --mkidx="${POLDEK_INDEX_DIR}/packages.dir.gz"
-                               run_poldek --sn ${POLDEK_SOURCE} --up
+                       if [ "$UPDATE_POLDEK_INDEXES" = "yes" -a "$COMMAND" != "build-prep" ]; then
+                               run_poldek --sdir="${POLDEK_INDEX_DIR}" --mkidxz
                        fi
                        remove_build_requires;
                else
@@ -1510,7 +1784,9 @@ case "$COMMAND" in
                        get_spec;
                        parse_spec;
                        if [ -n "$ICONS" ]; then
-                               get_files $ICONS
+                               OLD_UPDATE5=$UPDATE5
+                               UPDATE5= get_files $ICONS
+                               UPDATE5=$OLD_UPDATE5
                                parse_spec;
                        fi
                        if [ -n "$NOSOURCE0" ] ; then
@@ -1523,7 +1799,7 @@ case "$COMMAND" in
                ;;
        "tag" )
                NOURLS=1
-               NODIST=1
+               NODIST="yes"
                init_builder;
                if [ -n "$SPECFILE" ]; then
                        get_spec;
@@ -1549,12 +1825,47 @@ case "$COMMAND" in
        "mr-proper" )
                $RPM --clean --rmsource --rmspec --force --nodeps $SPECFILE
                ;;
+       "list-sources-files" )
+               init_builder
+               NOCVSSPEC="yes"
+               DONT_PRINT_REVISION="yes"
+               get_spec
+               parse_spec
+               SAPS="$SOURCES $PATCHES"
+               for SAP in $SAPS ; do
+                        echo $SAP | awk '{gsub(/.*\//,"") ; print}'
+               done
+               ;;
+       "list-sources-urls" )
+               init_builder
+               NOCVSSPEC="yes"
+               DONT_PRINT_REVISION="yes"
+               get_spec
+               parse_spec
+               SAPS="$SOURCES $PATCHES"
+               for SAP in $SAPS ; do
+                        echo $SAP
+               done
+               ;;
+       "list-sources-local-paths" )
+               init_builder
+               NOCVSSPEC="yes"
+               DONT_PRINT_REVISION="yes"
+               get_spec
+               parse_spec
+               SAPS="$SOURCES $PATCHES"
+               for SAP in $SAPS ; do
+                        echo $SOURCE_DIR/$(echo $SAP | awk '{gsub(/.*\//,"") ; print }')
+               done
+               ;;
        "usage" )
                usage;;
        "version" )
                echo "$VERSION";;
 esac
-test -f `pwd`/.${SPECFILE}_INSTALLED_PACKAGES && rm `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
+if [ -f "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES" -a "$REMOVE_BUILD_REQUIRES" != "" ]; then
+       rm "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES"
+fi
 cd "$__PWD"
 
 # vi:syntax=sh:ts=3:sw=4
This page took 0.102375 seconds and 4 git commands to generate.