From 7330ccd288a001d33866308ff8d679a884230d83 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 22 Oct 2013 17:44:33 +0100
Subject: [PATCH] java: Remove version number from the jar file (RHBZ#1022184).

---
 contrib/make-check-on-installed.pl |  2 +-
 java/Makefile.am                   | 12 ++++++------
 java/examples/Makefile.am          |  2 +-
 run.in                             |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/make-check-on-installed.pl b/contrib/make-check-on-installed.pl
index d2337e800..6716880d4 100755
--- a/contrib/make-check-on-installed.pl
+++ b/contrib/make-check-on-installed.pl
@@ -97,7 +97,7 @@ my %mapping = (
 
     '/guestfs/supermin.d/.*' => "appliance/supermin.d",
 
-    '/java/libguestfs-.*\.jar$' => "java",
+    '/java/libguestfs\.jar$' => "java",
 
     '/libguestfs\.so.*' => "src/.libs",
     '/libguestfs_jni\.so.*' => "java/.libs",
diff --git a/java/Makefile.am b/java/Makefile.am
index 0076a9efc..601dfc58e 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -67,12 +67,12 @@ JAVADOC_FLAGS = -encoding utf-8
 # Java source.
 
 libguestfs_jardir = $(JAR_INSTALL_DIR)
-libguestfs_jar_DATA = libguestfs-${VERSION}.jar
+libguestfs_jar_DATA = libguestfs.jar
 libguestfs_jar_class_files = $(java_sources:.java=.class)
 $(libguestfs_jar_class_files): %.class: %.java
 	$(JAVAC) $(JAVAC_FLAGS) -d . -classpath $(srcdir):. $<
 
-libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
+libguestfs.jar: $(libguestfs_jar_class_files)
 	$(JAR) cf $@ $^
 
 # JNI source.
@@ -130,10 +130,10 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
 
 noinst_DATA = Bindtests.class $(java_tests:.java=.class)
 
-t/%.class: t/%.java libguestfs-$(VERSION).jar
-	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d t $<
+t/%.class: t/%.java libguestfs.jar
+	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs.jar -d t $<
 
-Bindtests.class: Bindtests.java libguestfs-$(VERSION).jar
-	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d . $<
+Bindtests.class: Bindtests.java libguestfs.jar
+	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs.jar -d . $<
 
 endif
diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am
index f49419097..c9f9fd88b 100644
--- a/java/examples/Makefile.am
+++ b/java/examples/Makefile.am
@@ -50,6 +50,6 @@ noinst_SCRIPTS = CreateDisk.class InspectVM.class
 JAVAC_FLAGS = $(EXTRA_JAVAC_FLAGS) -encoding utf-8
 
 %.class: %.java
-	$(JAVAC) $(JAVAC_FLAGS) -classpath ../libguestfs-$(VERSION).jar $<
+	$(JAVAC) $(JAVAC_FLAGS) -classpath ../libguestfs.jar $<
 
 endif
diff --git a/run.in b/run.in
index 4a33d3853..bb3997d6e 100755
--- a/run.in
+++ b/run.in
@@ -142,9 +142,9 @@ export CAML_LD_LIBRARY_PATH
 # For Java.
 export JAVA_EXE=@JAVA_EXE@
 if [ -z "$CLASSPATH" ]; then
-    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
+    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs.jar"
 else
-    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar:$CLASSPATH"
+    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs.jar:$CLASSPATH"
 fi
 export CLASSPATH