diff --git a/.gitignore b/.gitignore index e7db352..8b4804d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ wmeissner-jffi-bbb81f1.tar.gz /1.2.8.zip /1.2.9.zip /1.2.10.zip +/1.2.11.zip diff --git a/MANIFEST.MF b/MANIFEST.MF deleted file mode 100644 index 8ab756c..0000000 --- a/MANIFEST.MF +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Bundle-SymbolicName: com.kenai.jffi -Export-Package: com.kenai.jffi;version="@VERSION" -Bundle-Name: Java Foreign Function Interface -Bundle-Version: @VERSION -Bundle-ManifestVersion: 2 -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 - diff --git a/NATIVE-MANIFEST.MF b/NATIVE-MANIFEST.MF deleted file mode 100644 index 56317b4..0000000 --- a/NATIVE-MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -JavaPackages-Classifier: native -Archiver-Version: Plexus Archiver -JavaPackages-Version: @VERSION -Bundle-Version: @VERSION -Bundle-SymbolicName: com.kenai.jffi.native -Fragment-Host: com.kenai.jffi -Bundle-ClassPath: .,jni -JavaPackages-ArtifactId: jffi -JavaPackages-GroupId: com.github.jnr -Created-By: Apache Maven 3.3.3 -Build-Jdk: 1.8.0_60 - diff --git a/jffi.spec b/jffi.spec index 64e2730..f530b84 100644 --- a/jffi.spec +++ b/jffi.spec @@ -2,15 +2,13 @@ %global sover 1.2 Name: jffi -Version: 1.2.10 +Version: 1.2.11 Release: 1%{?dist} Summary: Java Foreign Function Interface License: LGPLv3+ or ASL 2.0 URL: http://github.com/jnr/jffi Source0: https://github.com/%{cluster}/%{name}/archive/%{version}.zip -Source1: MANIFEST.MF -Source2: NATIVE-MANIFEST.MF Source3: p2.inf Patch0: jffi-fix-dependencies-in-build-xml.patch Patch1: jffi-add-built-jar-to-test-classpath.patch @@ -40,10 +38,6 @@ This package contains the API documentation for %{name}. %prep %setup -q -cp %{SOURCE1} . -cp %{SOURCE2} . -sed -i -e's/@VERSION/%{version}/g' MANIFEST.MF -sed -i -e's/@VERSION/%{version}/g' NATIVE-MANIFEST.MF %patch0 %patch1 %patch2 @@ -77,7 +71,7 @@ cp -p dist/jffi-*-Linux.jar archive/ mkdir -p META-INF/ cp %{SOURCE3} META-INF/ -jar umf MANIFEST.MF %{buildroot}%{_jnidir}/%{name}/%{name}.jar META-INF/p2.inf +jar uf %{buildroot}%{_jnidir}/%{name}/%{name}.jar META-INF/p2.inf # install *.so install -dm 755 %{buildroot}%{_libdir}/%{name} @@ -87,8 +81,6 @@ sofile=`find %{buildroot}%{_libdir}/%{name} -name lib%{name}-%{sover}.so` chmod +x ${sofile} ln -sr ${sofile} `dirname ${sofile}`/lib%{name}.so -jar umf NATIVE-MANIFEST.MF %{buildroot}%{_jnidir}/%{name}/%{name}-native.jar - %check # skip tests on s390 until https://bugzilla.redhat.com/show_bug.cgi?id=1084914 is resolved %ifnarch s390 @@ -108,6 +100,9 @@ ant -Duse.system.libffi=1 test %doc COPYING.GPL COPYING.LESSER LICENSE %changelog +* Mon Apr 18 2016 Alexander Kurtakov 1.2.11-1 +- Update to upstream 1.2.11 release containing OSGification. + * Fri Feb 5 2016 Alexander Kurtakov 1.2.10-1 - Update to upstream 1.2.10 release. diff --git a/sources b/sources index c3ba45c..c515a36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b64b2023a4c93433af21f13767ceb32 1.2.10.zip +6427d1063c546a51be00e681be42e2d1 1.2.11.zip