rpms/libmatthew-java/devel jpackage_compliance.patch, 1.1, 1.2 libmatthew-java.spec, 1.1, 1.2

[Omair Majid (omajid)]

Author: omajid

Update of /cvs/pkgs/rpms/libmatthew-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27883

Modified Files:
	jpackage_compliance.patch libmatthew-java.spec 
Log Message:
fixed system dependent paths for jni libraries


jpackage_compliance.patch:

Index: jpackage_compliance.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/jpackage_compliance.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpackage_compliance.patch	27 Jun 2008 19:52:15 -0000	1.1
+++ jpackage_compliance.patch	2 Jul 2008 15:32:55 -0000	1.2
@@ -31,7 +31,7 @@
     private native void setenv(String var, String value);
     {
 -      System.loadLibrary("cgi-java");
-+      System.load("/usr/lib/libmatthew-java/libcgi-java.so");
++      System.load("@JNIPATH@/" + System.mapLibraryName("cgi-java") );
     }
  
     /**
@@ -44,7 +44,7 @@
  public class UnixServerSocket
  {
 -   static { System.loadLibrary("unix-java"); }
-+   static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); }
++   static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java")); }
     private native int native_bind(String address, boolean abs) throws IOException;
     private native void native_close(int sock) throws IOException;
     private native int native_accept(int sock) throws IOException;
@@ -57,7 +57,7 @@
  public class UnixSocket
  {
 -   static { System.loadLibrary("unix-java"); }
-+   static { System.load("/usr/lib/libmatthew-java/libunix-java.so"); }
++   static { System.load("@JNIPATH@/" + System.mapLibraryName("unix-java") ); }
     private native void native_set_pass_cred(int sock, boolean passcred) throws IOException;
     private native int native_connect(String address, boolean abs) throws IOException;
     private native void native_close(int sock) throws IOException;


Index: libmatthew-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatthew-java/devel/libmatthew-java.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmatthew-java.spec	27 Jun 2008 19:52:15 -0000	1.1
+++ libmatthew-java.spec	2 Jul 2008 15:32:55 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           libmatthew-java
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A few useful Java libraries
 Group:          Development/Libraries
 License:        LGPLv2
@@ -73,7 +73,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
+# this patch adds a system dependent path, so we fix it before
+# applying the patch
+sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH2} | patch -p1
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -133,9 +137,13 @@
 
 
 %files javadoc
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jul 2 2008 Omair Majid <omajid at redhat.com> 0.7.1-2
+- Fixed hardcoded paths for jni libraries
+
 * Wed Jun 25 2008 Omair Majid <omajid at redhat.com> 0.7.1-1.fc9
 - Initial build for fedora