|
Yaakov Selkowitz |
8928b69 |
Workaround for brp-java-repack-jars skipping top-level dot-files
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
--- java-gnome-4.1.3-orig/configure 2013-05-04 20:08:23.000000000 -0500
|
|
Yaakov Selkowitz |
8928b69 |
+++ java-gnome-4.1.3/configure 2014-05-25 22:41:33.344932567 -0500
|
|
Yaakov Selkowitz |
8928b69 |
@@ -2293,7 +2293,7 @@
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
output " - native library location";
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
-open LIBRARY, ">.libdir";
|
|
Yaakov Selkowitz |
8928b69 |
+open LIBRARY, ">libdir.properties";
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
print LIBRARY <
|
|
Yaakov Selkowitz |
8928b69 |
$libdir
|
|
Yaakov Selkowitz |
8928b69 |
--- java-gnome-4.1.3-orig/Makefile 2013-05-04 20:08:23.000000000 -0500
|
|
Yaakov Selkowitz |
8928b69 |
+++ java-gnome-4.1.3/Makefile 2014-05-25 22:41:22.232100829 -0500
|
|
Yaakov Selkowitz |
8928b69 |
@@ -60,7 +60,7 @@
|
|
Yaakov Selkowitz |
8928b69 |
@/bin/echo -e "INSTALL\t$@"
|
|
Yaakov Selkowitz |
8928b69 |
cp -f $< $@
|
|
Yaakov Selkowitz |
8928b69 |
@/bin/echo -e "JAR\t$@"
|
|
Yaakov Selkowitz |
8928b69 |
- jar uf $@ .libdir
|
|
Yaakov Selkowitz |
8928b69 |
+ jar uf $@ libdir.properties
|
|
Yaakov Selkowitz |
8928b69 |
@/bin/echo -e "SYMLINK\t$(@D)/gtk.jar -> gtk-$(APIVERSION).jar"
|
|
Yaakov Selkowitz |
8928b69 |
cd $(@D) && rm -f gtk.jar && ln -s gtk-$(APIVERSION).jar gtk.jar
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
@@ -114,7 +114,7 @@
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
distclean: clean
|
|
Yaakov Selkowitz |
8928b69 |
@/bin/echo -e "RM\tbuild configuration information"
|
|
Yaakov Selkowitz |
8928b69 |
- -rm -f .config .config.tmp .libdir
|
|
Yaakov Selkowitz |
8928b69 |
+ -rm -f .config .config.tmp libdir.properties
|
|
Yaakov Selkowitz |
8928b69 |
@/bin/echo -e "RM\tgenerated documentation"
|
|
Yaakov Selkowitz |
8928b69 |
-rm -rf doc/api/*
|
|
Yaakov Selkowitz |
8928b69 |
-rm -f java-gnome-*.tar.bz2
|
|
Yaakov Selkowitz |
8928b69 |
--- java-gnome-4.1.3-orig/src/bindings/org/freedesktop/bindings/Plumbing.java 2013-05-04 20:08:23.000000000 -0500
|
|
Yaakov Selkowitz |
8928b69 |
+++ java-gnome-4.1.3/src/bindings/org/freedesktop/bindings/Plumbing.java 2014-05-25 22:42:03.203480823 -0500
|
|
Yaakov Selkowitz |
8928b69 |
@@ -128,7 +128,7 @@
|
|
Yaakov Selkowitz |
8928b69 |
}
|
|
Yaakov Selkowitz |
8928b69 |
}
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
- private static final String LIBDIR_FILE = ".libdir";
|
|
Yaakov Selkowitz |
8928b69 |
+ private static final String LIBDIR_FILE = "libdir.properties";
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
/**
|
|
Yaakov Selkowitz |
8928b69 |
* Load the native library. The governing assumption is that the .jar
|
|
Yaakov Selkowitz |
8928b69 |
@@ -171,7 +171,7 @@
|
|
Yaakov Selkowitz |
8928b69 |
|
|
Yaakov Selkowitz |
8928b69 |
try {
|
|
Yaakov Selkowitz |
8928b69 |
/*
|
|
Yaakov Selkowitz |
8928b69 |
- * Attmept to load the .libdir file and use its contents as the
|
|
Yaakov Selkowitz |
8928b69 |
+ * Attmept to load the libdir.properties file and use its contents as the
|
|
Yaakov Selkowitz |
8928b69 |
* directory which we will load our shared library from.
|
|
Yaakov Selkowitz |
8928b69 |
*/
|
|
Yaakov Selkowitz |
8928b69 |
in = loader.getResourceAsStream(LIBDIR_FILE);
|