[leveldbjni] fix leveldbjni-all.jar

[gil]

commit 9710f60c38d1b4f265438493a36835d7c76bedc1
Author: gil <puntogil at libero.it>
Date:   Thu May 8 19:23:32 2014 +0200

    fix leveldbjni-all.jar

 leveldbjni.spec |   58 +++++++++++++++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 31 deletions(-)
---
diff --git a/leveldbjni.spec b/leveldbjni.spec
index 62386f5..4c1aef3 100644
--- a/leveldbjni.spec
+++ b/leveldbjni.spec
@@ -7,7 +7,7 @@
 
 Name:          leveldbjni
 Version:       1.8
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       A Java Native Interface to LevelDB
 License:       BSD
 URL:           https://github.com/fusesource/leveldbjni/
@@ -62,50 +62,46 @@ This package contains javadoc for %{name}.
 %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Private-Package" %{name}-all
 %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Export-Package" %{name}-all
 %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Import-Package" %{name}-all
+
 %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" '
 <Import-Package>
  org.fusesource.hawtjni.runtime,
- org.fusesource.leveldbjni*;version=${project.version},
- org.iq80.leveldb*;version=${leveldb-api-version},
+ org.iq80.leveldb*;version=${leveldb-api-version}
 </Import-Package>' %{name}-all
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Embed-Dependency"  %{name}-all
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-NativeCode"  %{name}-all
-
-%if %{bits} == 64
-%pom_remove_dep org.fusesource.%{name}:%{name}-linux32 %{name}-all
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='leveldbjni-linux64']/pom:version" '
-${project.version}' %{name}-all
 
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='leveldbjni']/pom:version" '
-${project.version}' %{name}-linux64
+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" '
+<Export-Package>
+ org.fusesource.leveldbjni*;version=${project.version}
+</Export-Package>' %{name}-all
 
-%pom_xpath_set "pom:project/pom:parent/pom:version" "
-%{version}" %{name}-linux64
+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" '
+<Private-Package>
+ org.fusesource.leveldbjni.internal*,!*
+</Private-Package>' %{name}-all
 
-%pom_xpath_set "pom:project/pom:version" "
-%{version}" %{name}-linux64
+%if %{bits} == 64
+%pom_remove_dep org.fusesource.%{name}:%{name}-linux32 %{name}-all
 
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='leveldbjni']/pom:version" '
-${project.version}' %{name}-linux64
+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" "
+<Bundle-NativeCode>
+  META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64
+</Bundle-NativeCode>" %{name}-all
 
 %else
 %pom_remove_dep org.fusesource.%{name}:%{name}-linux64 %{name}-all
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='leveldbjni-linux32']/pom:version" '
-${project.version}' %{name}-all
-
-%pom_xpath_set "pom:project/pom:parent/pom:version" "
-%{version}" %{name}-linux32
-
-%pom_xpath_set "pom:project/pom:version" "
-%{version}"  %{name}-linux32
 
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='leveldbjni']/pom:version" '
-${project.version}'  %{name}-linux32
+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" "
+<Bundle-NativeCode>
+  META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86
+</Bundle-NativeCode>" %{name}-all
 
 %endif
 
+rm -r %{name}/src/test/java/org/fusesource/%{name}/test/DBTest.java
+
 %build
 
+%mvn_file :%{name}-all %{name}-all
 %mvn_file :%{name}-linux%{bits} %{name}-linux
 export JAVA_HOME=%{_jvmdir}/java LEVELDB_HOME=%{_prefix} SNAPPY_HOME=%{_prefix}
 %mvn_build -- -Plinux%{bits},all -Dleveldb=%{_prefix} -Dsnappy=%{_prefix}
@@ -113,17 +109,17 @@ export JAVA_HOME=%{_jvmdir}/java LEVELDB_HOME=%{_prefix} SNAPPY_HOME=%{_prefix}
 %install
 %mvn_install
 
-install -m 644 %{name}/target/%{name}-%{version}-tests.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar
-
 %files  -f .mfiles
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-tests.jar
 %doc changelog.md license.txt readme.md releasing.md
 
 %files javadoc -f .mfiles-javadoc
 %doc license.txt
 
 %changelog
+* Thu May 08 2014 gil cattaneo <puntogil at libero.it> 1.8-2
+- fix leveldbjni-all.jar
+
 * Tue Apr 22 2014 gil cattaneo <puntogil at libero.it> 1.8-1
 - update to 1.8