[java-sig-commits] [javapackages] Fix prefix handling in maven_depmap

Mikolaj Izdebski mizdebsk at fedoraproject.org
Fri Sep 20 07:30:18 UTC 2013


commit c8b81acca1f21bc96916d73fe7e6383131e571b0
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Sep 19 19:27:39 2013 +0200

    Fix prefix handling in maven_depmap

 java-utils/maven_depmap.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index f787957..d62c696 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -81,10 +81,10 @@ class UnknownFileExtension(Exception):
 def _get_javadir_part(jar_path, prefix):
     # This is not nice, because macros can change but handling these
     # in RPM macros is ugly as hell.
-    javadirs=[os.path.join(prefix, part) for part in ["usr/share/java",
-                                                      "usr/share/java-jni",
-                                                      "usr/lib/java",
-                                                      "usr/lib64/java"]]
+    javadirs=[os.path.join(prefix, part) for part in ["share/java",
+                                                      "share/java-jni",
+                                                      "lib/java",
+                                                      "lib64/java"]]
     jarpart = None
     for jdir in javadirs:
         if jdir in jar_path:


More information about the java-sig-commits mailing list