Merge branch 'master' of git.alt:/people/damir/packages/rpm

autodeps/linux.prov.in

@@ -52,6 +52,8 @@ ParseMethod()
 				FIND_SHELL=
 				FIND_TCL=
 				;;
+			java|nojava)
+				;;
 			lib)
 				FIND_LIBS=1
 				;;

autodeps/linux.req.in

@@ -36,6 +36,7 @@ exit_handler()
 trap exit_handler EXIT
 
 FIND_FILES=
+FIND_JAVA=
 FIND_LIBPERL=
 FIND_LIBS=
 FIND_MONO=
@@ -54,6 +55,7 @@ ParseMethod()
 		case "${t/%,}" in
 			no|none|off|false)
 				FIND_FILES=
+				FIND_JAVA=
 				FIND_LIBPERL=
 				FIND_LIBS=
 				FIND_MONO=
@@ -64,6 +66,12 @@ ParseMethod()
 				FIND_SHELL=
 				FIND_TCL=
 				;;
+			java)
+				FIND_JAVA=1
+				;;
+			nojava)
+				FIND_JAVA=
+				;;
 			lib|library)
 				FIND_LIBS=1
 				;;
@@ -131,6 +139,7 @@ ParseMethod()
 				FIND_LIBPERL=1
 				FIND_LIBS=1
 				FIND_MONO=1
+				FIND_JAVA=1
 				FIND_PAM=1
 				FIND_PERL=1
 				FIND_PKGCONFIG=1
@@ -159,6 +168,7 @@ if [ -n "$FIND_PAM" -o \
 fi
 
 if [ -z "$FIND_FILES" -a \
+     -z "$FIND_JAVA" -a \
      -z "$FIND_LIBPERL" -a \
      -z "$FIND_LIBS" -a \
      -z "$FIND_MONO" -a \
@@ -187,11 +197,23 @@ case "$LD_PRELOAD" in
 esac
 
 FOUND_REQS=
+LIST_JAVA=
 LIST_MONO=
 LIST_PERL=
 LIST_PYTHON=
 LIST_TCL=
 
+FindJavaReqs()
+{
+	[ -n "$FIND_JAVA" -a -n "$LIST_JAVA" -a -x "@RPMCONFIGDIR@/java.req" ] || return 0
+
+	local r
+	r="$(printf %s\\n "$LIST_JAVA" |
+	     @RPMCONFIGDIR@/java.req "$RPM_BUILD_DIR" "$RPM_BUILD_ROOT" "$RPM_LIBDIR")" || return 1
+	[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" || FOUND_REQS="$FOUND_REQS
+$r"
+}
+
 FindMonoReqs()
 {
 	[ -n "$FIND_MONO" -a -n "$LIST_MONO" -a -x "@RPMCONFIGDIR@/mono.req" ] || return 0
@@ -424,10 +446,17 @@ $r"
 $f"
 	elif [ -z "${t##*MS Windows PE*}" ]; then
 		[ -z "$LIST_MONO" ] && LIST_MONO="$f" || LIST_MONO="$LIST_MONO
+$f"
+	elif [ -z "${t##*Zip archive data*}" -a -z "${f##*.jar}" ] ||
+	     [ -z "${t##*compiled Java class data*}" ]; then
+		[ -z "$LIST_JAVA" ] && LIST_JAVA="$f" || LIST_JAVA="$LIST_JAVA
 $f"
 	fi
 done
 
+# Find requires in listed Java files, if any
+FindJavaReqs
+
 # Find requires in listed .Net files, if any
 FindMonoReqs
 

platform.in

@@ -454,8 +454,8 @@
 @alt@%_tcl_req_skip	""
 @alt@%_fixup_method	binconfig pkgconfig libtool
 @alt@%_strip_method	%{?_enable_debug:none}%{!?_enable_debug:executable shared}
-@alt@%_findreq_default_method	files lib mono pam perl pkgconfig python shell tcl
+@alt@%_findreq_default_method	files java lib mono pam perl pkgconfig python shell tcl
-@alt@%_findprov_default_method	lib mono pam perl pkgconfig python shell tcl
+@alt@%_findprov_default_method	java lib mono pam perl pkgconfig python shell tcl
 @alt@
 @alt@%_cleanup_topdir	%nil
 @alt@%_compress_topdir	%_usr