Merge branch 'PLD'

Conflicts:
	builder.sh

diff --git a/adapter.awk b/adapter.awk
index 1bde214cccc35f44cf569e36f90b9b1492ab0a58..cda077e822c08a41d9d53537289cac62d92e7553 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -2066,23 +2066,32 @@ function replace_requires() {
        # bad package.xml, see http://pear.php.net/bugs/bug.php?id=17779
        sub(/^php-php-gtk/, "php-gtk2", $2);
 
-       # jpackages
+       # jpackages / fedora java packages
        sub(/^antlr3$/, "java-antlr3", $2);
        sub(/^avalon-framework$/, "java-avalon-framework", $2);
        sub(/^avalon-logkit$/, "java-avalon-logkit", $2);
        sub(/^axis$/, "java-axis", $2);
+       sub(/^bouncycastle$/, "java-bcprov", $2);
+       sub(/^bouncycastle-mail$/, "java-bcmail", $2);
+       sub(/^bouncycastle-tsp$/, "java-bctsp", $2);
        sub(/^bsf$/, "java-bsf", $2);
+       sub(/^dom4j$/, "java-dom4j", $2);
+       sub(/^flute$/, "java-flute", $2);
        sub(/^gnu-regexp$/, "java-gnu-regexp", $2);
        sub(/^gnu.regexp$/, "java-gnu-regexp", $2);
        sub(/^hamcrest$/, "java-hamcrest", $2);
+       sub(/^itext$/, "java-itext", $2);
        sub(/^jaas$/, "java(jaas)", $2);
        sub(/^jaf$/, "java(jaf)", $2);
        sub(/^jakarta-ant$/, "ant", $2);
+       sub(/^jakarta-commons-codec$/, "java-commons-codec", $2);
        sub(/^jakarta-commons-httpclient$/, "java-commons-httpclient", $2);
+       sub(/^jakarta-commons-logging$/, "java-commons-logging", $2);
        sub(/^jakarta-log4j$/, "java-log4j", $2);
        sub(/^jakarta-oro$/, "java-oro", $2);
        sub(/^jakarta-servletapi$/, "java(servlet)", $2);
        sub(/^java-devel$/, "jdk", $2);
+       sub(/^java-xerces$/, "java(jaxp_parser_impl)", $2);
        sub(/^java\(JSP\)$/, "java(jsp)", $2);
        sub(/^java\(JavaServerFaces\)$/, "java(javaserverfaces)", $2);
        sub(/^java\(Portlet\)$/, "java(portlet)", $2);
@@ -2102,22 +2111,35 @@ function replace_requires() {
        sub(/^jsse$/, "java(jsse)", $2);
        sub(/^jta$/, "java(jta)", $2);
        sub(/^junit$/, "java-junit", $2);
+       sub(/^junit4$/, "java-junit", $2);
        sub(/^ldapjdk$/, "ldapsdk", $2);
+       sub(/^libbase$/, "java-libbase", $2);
+       sub(/^libfonts$/, "java-libfonts", $2);
+       sub(/^libformula$/, "java-libformula", $2);
+       sub(/^liblayout$/, "java-liblayout", $2);
+       sub(/^libloader$/, "java-libloader", $2);
+       sub(/^librepository$/, "java-librepository", $2);
+       sub(/^libserializer$/, "java-libserializer", $2);
        sub(/^log4j$/, "java-log4j", $2);
        sub(/^logging-log4j$/, "java-log4j", $2);
        sub(/^oro$/, "java-oro", $2);
+       sub(/^pdf-renderer$/, "java-pdf-renderer", $2);
+       sub(/^pentaho-libxml$/, "java-libxml", $2);
        sub(/^rhino$/, "java-rhino", $2);
+       sub(/^sac$/, "java-sac", $2);
        sub(/^saxon-scripts$/, "saxon", $2);
        sub(/^servlet$/, "java(servlet)", $2);
        sub(/^uddi4j$/, "java-uddi4j", $2);
+       sub(/^ws-jaxme$/, "java-jaxme", $2);
        sub(/^wsdl4j$/, "java-wsdl4j", $2);
        sub(/^xalan-j$/, "java-xalan", $2);
        sub(/^xalan-j2$/, "java-xalan", $2);
        sub(/^xerces-j$/, "java(jaxp_parser_impl)", $2);
        sub(/^xerces-j2$/, "java(jaxp_parser_impl)", $2);
-       sub(/^java-xerces$/, "java(jaxp_parser_impl)", $2);
-       sub(/^xml-commons-apis$/, "java-xml-commons-apis", $2);
+       sub(/^xml-commons-apis$/, "java-xml-commons", $2);
        sub(/^xml-commons-resolver$/, "java-xml-commons-resolver", $2);
+       sub(/^xmldb-api$/, "java-xmldb", $2);
+       sub(/^xmldb-api-sdk$/, "java-xmldb-sdk", $2);
 
        # fedora / redhat
        sub(/^Django$/, "python-django", $2);
@@ -2144,6 +2166,7 @@ function replace_requires() {
        sub(/^initscripts$/, "rc-scripts", $2);
        sub(/^iproute$/, "iproute2", $2);
        sub(/^iscsi-initiator-utils$/, "open-iscsi", $2);
+       sub(/^keyutils-libs-devel$/, "keyutils-devel", $2);
        sub(/^libXft-devel$/, "xorg-lib-libXft-devel", $2);
        sub(/^libXrandr-devel$/, "xorg-lib-libXrandr-devel", $2);
        sub(/^libacl-devel$/, "acl-devel", $2);
@@ -2154,6 +2177,7 @@ function replace_requires() {
        sub(/^libtdb-devel$/, "tdb-devel", $2);
        sub(/^libtevent$/, "tevent", $2);
        sub(/^libtevent-devel$/, "tevent-devel", $2);
+       sub(/^libusb1-devel$/, "libusb-devel", $2);
        sub(/^mod_wsgi$/, "apache-mod_wsgi", $2);
        sub(/^notify-python$/, "python-pynotify", $2);
        sub(/^pcsc-lite-ccid$/, "pcsc-driver-ccid", $2);
@@ -2185,6 +2209,7 @@ function replace_requires() {
        sub(/^sip-devel$/, "python-sip-devel", $2);
        sub(/^tftp-server$/, "tftpdaemon", $2);
        sub(/^tkinter$/, "python-tkinter", $2);
+       sub(/^urw-fonts$/, "fonts-Type1-urw", $2);
        sub(/^xapian-bindings-python$/, "python-xapian", $2);
        sub(/^xorg-x11-server-sdk$/, "xorg-xserver-server-devel", $2);
 
@@ -2236,10 +2261,14 @@ function replace_requires() {
        sub(/^vala-devel$/, "vala", $2);
 
        # altlinux
+       sub(/^libatk-devel$/, "atk-devel", $2);
        sub(/^libgit-devel$/, "git-core-devel", $2);
+       sub(/^libgtk\+2-devel$/, "gtk+2-devel", $2);
        sub(/^libncurses-devel$/, "ncurses-devel", $2);
        sub(/^libncursesxx-devel$/, "ncurses-c++-devel", $2);
+       sub(/^libpango-devel$/, "pango-devel", $2);
        sub(/^libpcre-devel$/, "pcre-devel", $2);
+       sub(/^libpopt-devel$/, "popt-devel", $2);
        sub(/^libssl-devel$/, "openssl-devel", $2);
 
        # suse

diff --git a/builder.sh b/builder.sh
index b23153c5c638ae1e4e43fafba33302aa55f9a94b..318b0af6fbdd68bd587e36ae65cdc39c8ce440b5 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -104,6 +104,11 @@ PACKAGE_VERSION=""
 PACKAGE_NAME=""
 ASSUMED_NAME=""
 PROTOCOL="http"
+
+# use lftp by default when available
+USE_LFTP=
+lftp --version > /dev/null 2>&1 && USE_LFTP=yes
+
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
 
 CVS_FORCE=""
@@ -193,6 +198,10 @@ elif [ -n "$USE_AXEL" ]; then
        GETURI="axel -a $AXEL_OPTS"
        GETURI2="$GETURI"
        OUTFILEOPT="-o"
+elif [ -n "$USE_LFTP" ]; then
+       GETURI=download_lftp
+       GETURI2=$GETURI
+       OUTFILEOPT=""
 else
        wget --help 2>&1 | grep -q -- ' --no-check-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
        wget --help 2>&1 | grep -q -- ' --inet ' && WGET_OPTS="$WGET_OPTS --inet"
@@ -206,7 +215,7 @@ fi
 
 GETLOCAL="cp -a"
 
-if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
+if rpm --version 2>&1 | grep -q '4.0.[0-2]'; then
        RPM="rpm"
        RPMBUILD="rpm"
 else
@@ -245,6 +254,26 @@ run_poldek() {
 #---------------------------------------------
 # functions
 
+download_lftp() {
+       local outfile=$1 url=$2 retval tmpfile
+       # TODO: use mktemp
+       tmpfile=$outfile.tmp
+       lftp -c "
+               $([ "$DEBUG" = "yes" ] && echo "debug 5;")
+               set net:max-retries $WGET_RETRIES;
+               set http:user-agent \"$USER_AGENT\";
+               pget -n 10 -c \"$url\" -o \"$tmpfile\"
+       "
+
+       retval=$?
+       if [ $retval -eq 0 ]; then
+               mv -f "$tmpfile" "$outfile"
+       else
+               rm -f "$tmpfile"
+       fi
+       return $retval
+}
+
 usage() {
        if [ -n "$DEBUG" ]; then set -xv; fi
        echo "\
@@ -376,9 +405,8 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
                     - abort instead of applying patch <patchnumber>
 --show-bconds       - show available conditional builds, which can be used
                     - with --with and/or --without switches.
---show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by
-                      ./repackage.sh script. in other words, the output is
-                      parseable by scripts.
+--show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by ./repackage.sh script.
+                      In other words, the output is parseable by scripts.
 --show-avail-bconds - show available bconds
 --with/--without <feature>
                     - conditional build package depending on %_with_<feature>/
@@ -386,8 +414,8 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
                       --with feat1 feat2 feat3 --without feat4 feat5 --with feat6
                       constructions. Set GROUP_BCONDS to yes to make use of it.
 --target <platform>, --target=<platform>
-                     - build for platform <platform>.
---init-rpm-dir       - initialize ~/rpm directory structure
+                    - build for platform <platform>.
+--init-rpm-dir      - initialize ~/rpm directory structure
 "
 }
 
@@ -626,7 +654,7 @@ parse_spec() {
        cd $PACKAGE_DIR
        cache_rpm_dump
 
-       if (rpm_dump | grep -qEi ":.*nosource.*1"); then
+       if rpm_dump | grep -qEi ":.*nosource.*1"; then
                FAIL_IF_NO_SOURCES="no"
        fi
 
@@ -1068,7 +1096,7 @@ update_md5() {
                if [ -n "$ADD5" ] && is_url $i || [ -n "$md5" ]; then
                        local tag="# $srcno-md5:\t"
                        if [[ "$md5" == *NoSource* ]]; then
-                               tag="# NoSource$srcno-md5:\t"
+                               tag="# No$srcno-md5:\t"
                        elif [ -n "$USEDIGEST" ]; then
                                tag="BuildRequires:\tdigest(%SOURCE$srcno) = "
                        fi
@@ -1220,10 +1248,10 @@ get_files() {
                                                im="$i"
                                        fi
                                        update_shell_title "${GETURI%% *}: $im"
-                                       ${GETURI} "$im" ${OUTFILEOPT} "$target" || \
+                                       ${GETURI} ${OUTFILEOPT} "$target" "$im" || \
                                        if [ "`echo $im | grep -E 'ftp://'`" ]; then
                                                update_shell_title "${GETURI2%% *}: $im"
-                                               ${GETURI2} "$im" ${OUTFILEOPT} "$target"
+                                               ${GETURI2} ${OUTFILEOPT} "$target" "$im"
                                        fi
                                        test -s "$target" || rm -f "$target"
                                fi
@@ -1548,7 +1576,7 @@ process_bcondrc() {
        # w32codec-installer license_agreement
        # php +mysqli
        # ---
-       if ([ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ])); then
+       if [ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ]); then
                :
        else
                return