From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 22 May 2007 20:01:05 +0000 (+0000)
Subject: - left on AC-branch
X-Git-Tag: auto/th/rpm-4_4_9-0_1~14
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=06d03e21e753205f536d1032ada623526c3e10df;ds=sidebyside

- left on AC-branch

Changed files:
    find-java-prov.sh -> 1.4
    find-java-req.sh -> 1.12
---

diff --git a/find-java-prov.sh b/find-java-prov.sh
deleted file mode 100755
index b13a73b..0000000
--- a/find-java-prov.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This script reads filenames from STDIN and outputs any relevant provides
-# information that needs to be included in the package.
-#
-# Based on rpm-4.4.2/scripts/find-req.pl
-# Authors: Elan Ruusamäe <glen@pld-linux.org>
-
-export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
-
-cat > /dev/null
diff --git a/find-java-req.sh b/find-java-req.sh
deleted file mode 100755
index 6d6106f..0000000
--- a/find-java-req.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# This script reads filenames from STDIN and outputs any relevant requires
-# information that needs to be included in the package.
-#
-# Based on rpm-4.4.2/scripts/find-req.pl
-# Authors: Elan Ruusamäe <glen@pld-linux.org>
-
-export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
-
-javaclassversion() {
-	[ $# -gt 0 ] || return
-
-	local ver
-	classver=$(echo "$@" | xargs -r file | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}' | sort -u)
-	[ "$classver" ] || return
-	for v in $classver; do
-		echo "java(ClassDataVersion) >= $v"
-	done
-}
-
-javajarversion() {
-	local jar="$1"
-
-	# 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')
-	rm -rf $tmp
-}
-
-FILES=$(cat -)
-
-find_requires() {
-	for file in $FILES; do
-		case $file in
-		*.jar)
-			javajarversion "$file"
-		;;
-		*.class)
-			javaclassversion "$file"
-		;;
-		esac
-	done
-}
-
-find_requires | sort -u