rpms/jna/devel jna-3.0.9-linux-nomaplibrary.patch, NONE, 1.1 jna.spec, 1.13, 1.14
Colin Walters
walters at fedoraproject.org
Sun Nov 30 18:44:03 UTC 2008
- Previous message: rpms/firstaidkit/devel firstaidkit.spec,1.14,1.15
- Next message: rpms/mono/devel mono-2.2-winforms.patch, NONE, 1.1 import.log, 1.17, 1.18 mono-2.2-uselibdir.patch, 1.1, 1.2 mono.spec, 1.90, 1.91 mono-2.2-pcfiles.patch, 1.3, NONE mono-2.2-script.patch, 1.1, NONE mono-big-integer-CVE-2007-5197.patch, 1.1, NONE mono-mcs-config.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: walters
Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16975
Modified Files:
jna.spec
Added Files:
jna-3.0.9-linux-nomaplibrary.patch
Log Message:
* Sun Nov 30 2008 Colin Walters <walters at redhat.com> - 3.0.9-2
- Fix library mapping, remove upstreamed patches
jna-3.0.9-linux-nomaplibrary.patch:
--- NEW FILE jna-3.0.9-linux-nomaplibrary.patch ---
--- jna-3.0.9/src/com/sun/jna/NativeLibrary.java 2008-10-28 20:30:54.000000000 -0400
+++ jna-3.0.9.orig/src/com/sun/jna/NativeLibrary.java 2008-11-15 18:29:52.000000000 -0500
@@ -374,8 +374,9 @@
return name;
}
else if (Platform.isLinux()) {
- if (isVersionedName(libName)) {
- // A specific version was requested - use as is for search
+ if (isVersionedName(libName) || libName.endsWith(".so")) {
+ // An already mapped name was specified - use as is
+ // for search
return libName;
}
}
Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jna.spec 1 Nov 2008 01:05:21 -0000 1.13
+++ jna.spec 30 Nov 2008 18:43:32 -0000 1.14
@@ -1,6 +1,6 @@
Name: jna
Version: 3.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Pure Java access to native libraries
Group: Development/Libraries
@@ -22,10 +22,11 @@
Patch2: jna-tests-headless.patch
# https://jna.dev.java.net/issues/show_bug.cgi?id=90
Patch3: jna-3.0.4-nativemapped-array.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
-Patch4: jna-stringarray-return.patch
-# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
+# Not yet sent upstream - haven't decided whether it's a good idea yet,
+# but keeping around here for now.
Patch5: jna-callback-exception.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=95
+Patch6: jna-3.0.9-linux-nomaplibrary.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -58,8 +59,8 @@
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
%patch2 -p1 -b .tests-headless
%patch3 -p1 -b .nativemapped-array
-%patch4 -p1 -b .stringarray-return
#%patch5 -p1 -b .callback-exception
+%patch6 -p1 -b .linux-nomaplibrary
# all java binaries must be removed from the sources
find . -name '*.jar' -exec rm -f '{}' \;
@@ -113,6 +114,9 @@
%changelog
+* Sun Nov 30 2008 Colin Walters <walters at redhat.com> - 3.0.9-2
+- Fix library mapping, remove upstreamed patches
+
* Fri Oct 31 2008 Colin Walters <walters at redhat.com> - 3.0.9-1
- Rebase on upstream 3.0.9
- Previous message: rpms/firstaidkit/devel firstaidkit.spec,1.14,1.15
- Next message: rpms/mono/devel mono-2.2-winforms.patch, NONE, 1.1 import.log, 1.17, 1.18 mono-2.2-uselibdir.patch, 1.1, 1.2 mono.spec, 1.90, 1.91 mono-2.2-pcfiles.patch, 1.3, NONE mono-2.2-script.patch, 1.1, NONE mono-big-integer-CVE-2007-5197.patch, 1.1, NONE mono-mcs-config.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list