- drop javadeps, such huge lists make rpmbuild work forever and Memory Fault

Changed files:
    find-java-prov.sh -> 1.3
    find-java-req.sh -> 1.11

diff --git a/find-java-prov.sh b/find-java-prov.sh
index 00609d596607db0baa4b91977c27b9b844c0edb6..b13a73bc6776729fa309a4e4d6d1c7fa8381149f 100755 (executable)
--- a/find-java-prov.sh
+++ b/find-java-prov.sh
@@ -7,13 +7,4 @@
 
 export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
 
-for file in $(cat -); do
-       case $file in
-       *.jar)
-               unzip -p $file | javadeps --provides --rpmformat --keywords --starprov -
-       ;;
-       *.class)
-               javadeps --provides --rpmformat --keywords --starprov $file
-       ;;
-       esac
-done | sort -u
+cat > /dev/null

diff --git a/find-java-req.sh b/find-java-req.sh
index f191122ad9bf9f4c9c76771aa927aede9bb64665..6d6106fb485c7aebbbe8bb1c950939df6a3ddac9 100755 (executable)
--- a/find-java-req.sh
+++ b/find-java-req.sh
@@ -24,6 +24,8 @@ javajarversion() {
        # check only files, symlinks could point outside buildroot
        [ -f "$jar" -a ! -L "$jar" ] || return
 
+#      echo >&2 "find java requires: ${jar#$RPM_BUILD_ROOT}"
+
        tmp=$(mktemp -d)
        unzip -q -d $tmp $jar >&2
        javaclassversion $(find $tmp -type f -name '*.class')
@@ -37,48 +39,12 @@ find_requires() {
                case $file in
                *.jar)
                        javajarversion "$file"
-                       unzip -p $file | javadeps --requires --rpmformat --keywords -
                ;;
                *.class)
                        javaclassversion "$file"
-                       javadeps --requires --rpmformat --keywords $file
-               ;;
-               esac
-       done | sort -u
-}
-
-find_provides() {
-       for file in $FILES; do
-               case $file in
-               *.jar)
-                       unzip -p $file | javadeps --provides --rpmformat --keywords --starprov -
-               ;;
-               *.class)
-                       javadeps --provides --rpmformat --keywords --starprov $file
                ;;
                esac
-       done | sort -u
+       done
 }
 
-REQUIRES=$(find_requires)
-PROVIDES=$(find_provides)
-
-# This is a little magic trick to get all REQUIRES that are not
-# in PROVIDES. While RPM functions correctly when such deps exist,
-# they make the metadata a bit bloated.
-
-# Filter out dups from both lists
-REQUIRES=$(echo "$REQUIRES" | sort | uniq)
-PROVIDES=$(echo "$PROVIDES" | sort | uniq)
-
-#
-# Get a list of elements that exist in exactly one of PROVIDES or REQUIRES
-#
-UNIQ=$(echo "$PROVIDES
-$REQUIRES" | sort | uniq -u)
-
-#
-# Of those, only choose the ones that are in REQUIRES
-#
-echo "$UNIQ
-$REQUIRES" | sort | uniq -d
+find_requires | sort -u