diff --git a/import.log b/import.log index d0b4fb5..b78b2a7 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ xrootd-20100315-2_fc12:F-12:xrootd-20100315-2.fc12.src.rpm:1277088737 +xrootd-20100315-3_fc12:F-12:xrootd-20100315-3.fc12.src.rpm:1278687615 diff --git a/xrootd.spec b/xrootd.spec index d7b6fed..95f937c 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -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 - 20100315-3 +- Fix broken jar + * Mon Jun 14 2010 Mattias Ellert - 20100315-2 - Add LGPLv2+ to License tag due to man pages - Better package description