rpms/xrootd/EL-4 import.log,1.1,1.2 xrootd.spec,1.1,1.2

Mattias Ellert ellert at fedoraproject.org
Fri Jul 9 15:02:32 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/xrootd/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26128/EL-4

Modified Files:
	import.log xrootd.spec 
Log Message:
* Fri Jul 09 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 20100315-3
- Fix broken jar



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrootd/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	21 Jun 2010 02:57:45 -0000	1.1
+++ import.log	9 Jul 2010 15:02:32 -0000	1.2
@@ -1 +1,2 @@
 xrootd-20100315-2_fc12:EL-4:xrootd-20100315-2.fc12.src.rpm:1277089049
+xrootd-20100315-3_fc12:EL-4:xrootd-20100315-3.fc12.src.rpm:1278687737


Index: xrootd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrootd/EL-4/xrootd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xrootd.spec	21 Jun 2010 02:57:45 -0000	1.1
+++ xrootd.spec	9 Jul 2010 15:02:32 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		xrootd
 Version:	20100315
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Extended ROOT file server
 
 Group:		System Environment/Daemons
@@ -139,6 +139,14 @@ rm -rf pthreads-win32
 # Remove bundled gridsite library (not used anyway)
 rm -rf src/XrdSecssl/libsslGridSite
 
+# Use absolute path to load JNI library
+sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \
+    -i src/XrdClient/XrdClientAdminJNI.java
+
+# Fix JNI interface namespace
+sed 's!Java_XrdClientAdminJNI!Java_xrootdadmin_XrdClientAdminJNI!' \
+    -i src/XrdClient/XrdClientAdminJNI.cc
+
 ./bootstrap.sh
 
 %build
@@ -153,12 +161,7 @@ rm -rf src/XrdSecssl/libsslGridSite
 make %{?_smp_mflags}
 
 pushd src/XrdClient
-
-sed 's!loadLibrary("\(.*\)")!load("%{_libdir}/%{name}/lib\1.so")!' \
-    -i XrdClientAdminJNI.java
-javac XrdClientAdminJNI.java
-jar cvf XrdClientAdminJNI.jar XrdClientAdminJNI.class
-
+jar cvf XrdClientAdminJNI.jar xrootdadmin/XrdClientAdminJNI.class
 popd
 
 %install
@@ -343,6 +346,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 09 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 20100315-3
+- Fix broken jar
+
 * Mon Jun 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 20100315-2
 - Add LGPLv2+ to License tag due to man pages
 - Better package description



More information about the scm-commits mailing list