From 01f799479f353d2deba137e54663285d6b6e93c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 11 Apr 2007 13:47:48 +0000
Subject: [PATCH] - 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
---
 find-java-prov.sh | 11 +----------
 find-java-req.sh  | 42 ++++--------------------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/find-java-prov.sh b/find-java-prov.sh
index 00609d5..b13a73b 100755
--- 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 f191122..6d6106f 100755
--- 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
-- 
2.44.0