[gluegen2] Update version
Clément David
davidcl at fedoraproject.org
Fri Jan 4 07:48:36 UTC 2013
commit f05c89983c0b68ab7d2966457ff06406e36da0f3
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Thu Jan 3 14:00:51 2013 +0100
Update version
.gitignore | 10 +++++++++-
gluegen2-0002-use-fedora-jni.patch | 32 ++++++++++++++++----------------
gluegen2.spec | 22 ++++++++++++++++++----
sources | 2 +-
4 files changed, 44 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48aecbd..a27b99c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
-/gluegen-v2.0-rc10.tar.7z
+/gluegen-*.tar.7z
+/gluegen-*/
+*~
+.build*.log
+gluegen2-*.src.rpm
+/results_gluegen2/
+/noarch/
+/x86_64/
+
diff --git a/gluegen2-0002-use-fedora-jni.patch b/gluegen2-0002-use-fedora-jni.patch
index e81944d..a23fc4f 100644
--- a/gluegen2-0002-use-fedora-jni.patch
+++ b/gluegen2-0002-use-fedora-jni.patch
@@ -8,20 +8,20 @@
- Debug.getBooleanProperty(useTempJarCachePropName, true, true);
+ USE_TEMP_JAR_CACHE = false;
- loadGlueGenRTImpl();
-
-@@ -246,7 +245,13 @@ public class Platform extends PlatformPr
- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")");
- }
- }
-- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, Platform.class.getClassLoader());
-+ try {
-+ final String path = "%{_libdir}/%{name}/";
-+ final String lib = path + System.mapLibraryName(libBaseName);
-+ System.load(lib);
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
- return null;
+ AWT_AVAILABLE = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ public Boolean run() {
+@@ -248,7 +247,13 @@ public class Platform extends PlatformPr
+ System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")");
}
- });
+ }
+- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, Platform.class.getClassLoader());
++ try {
++ final String path = "%{_libdir}/%{name}/";
++ final String lib = path + System.mapLibraryName(libBaseName);
++ System.load(lib);
++ } catch (Exception e) {
++ e.printStackTrace();
++ }
+ }
+
+ /**
diff --git a/gluegen2.spec b/gluegen2.spec
index f6329eb..0db71a2 100644
--- a/gluegen2.spec
+++ b/gluegen2.spec
@@ -1,12 +1,23 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 5
-%global src_name gluegen-v2.0-rc10
+%global baserelease 6
+
+%global pkg_name gluegen
+%global pkg_version 2.0
+%global pkg_rc rc11
+
+%if 0%{?pkg_rc:1}
+%global pkg_release 0.%{baserelease}.%{pkg_rc}
+%global src_name %{pkg_name}-v%{pkg_version}-%{pkg_rc}
+%else
+%global pkg_release %{baserelease}
+%global src_name %{pkg_name}-v%{pkg_version}
+%endif
Name: gluegen2
-Version: 2.0
-Release: 0.%{baserelease}.rc10%{?dist}.1
+Version: %{pkg_version}
+Release: %{pkg_release}%{?dist}
Summary: Java/JNI glue code generator to call out to ANSI C
Group: Development/Libraries
@@ -212,6 +223,9 @@ _JAVA_OPTIONS="-Djogamp.debug=true -Djava.library.path=../build/test/build/nativ
%{_docdir}/%{name}
%changelog
+* Thu Jan 03 2013 Clément David <c.david86 at gmail.com> - 2.0-0.1.rc11
+- Update version
+
* Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.0-0.5.rc10.1
- revbump after jnidir change
- Fix symlink for JNI jar
diff --git a/sources b/sources
index ec64909..d602f5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63d628a17f4a9b6579cd43a5856e55dd gluegen-v2.0-rc10.tar.7z
+1d2b788fdc1b2aeb22ea31cd3351360f gluegen-v2.0-rc11.tar.7z
More information about the scm-commits
mailing list