Author: glen Date: Wed Apr 11 13:47:53 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- drop javadeps, such huge lists make rpmbuild work forever and Memory Fault
---- Files affected:
SOURCES:
find-java-req.sh (1.10 -> 1.11) , find-java-prov.sh (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/find-java-req.sh
diff -u SOURCES/find-java-req.sh:1.10 SOURCES/find-java-req.sh:1.11
--- SOURCES/find-java-req.sh:1.10 Wed Apr 11 15:46:12 2007
+++ SOURCES/find-java-req.sh Wed Apr 11 15:47:48 2007
@@ -24,6 +24,8 @@
# 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 @@
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
================================================================
Index: SOURCES/find-java-prov.sh
diff -u SOURCES/find-java-prov.sh:1.2 SOURCES/find-java-prov.sh:1.3
--- SOURCES/find-java-prov.sh:1.2 Wed Apr 11 00:00:07 2007
+++ SOURCES/find-java-prov.sh Wed Apr 11 15:47:48 2007
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/find-java-req.sh?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SOURCES/find-java-prov.sh?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
