From bec1ff3e6b6f6962c49e7a50460755d192492975 Mon Sep 17 00:00:00 2001 From: Levente Farkas Date: Thu, 25 Apr 2013 14:32:09 +0200 Subject: [PATCH] update to 3.5.2 --- jna.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/jna.spec b/jna.spec index 32d8d0f..9f85eef 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna -Version: 3.5.0 -Release: 2%{?dist} +Version: 3.5.2 +Release: 1%{?dist} Summary: Pure Java access to native libraries Group: Development/Libraries @@ -14,8 +14,6 @@ URL: https://jna.dev.java.net/ # rm -rf jna-%{version}/{dist/*,www} # tar cjf ~/rpm/SOURCES/jna-%{version}.tar.bz2 jna-%{version} Source0: %{name}-%{version}.tar.bz2 -Source1: pom-%{name}.xml -Source2: pom-platform.xml Patch0: jna-3.5.0-build.patch # This patch is Fedora-specific for now until we get the huge # JNI library location mess sorted upstream @@ -88,12 +86,11 @@ sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1 chmod -Rf a+rX,u+w,g-w,o-w . %patch3 -p0 -b .gcj-javadoc %patch4 -p1 -b .junit -cp %{SOURCE1} %{SOURCE2} ./ # UnloadTest fail during build since we modify class loading rm test/com/sun/jna/JNAUnloadTest.java # current bug: https://jna.dev.java.net/issues/show_bug.cgi?id=155 -rm test/com/sun/jna/DirectTest.java +#rm test/com/sun/jna/DirectTest.java # all java binaries must be removed from the sources #find . -name '*.jar' -delete @@ -112,10 +109,10 @@ chmod -c 0644 LICENSE OTHERS CHANGES.md %build # We pass -Ddynlink.native which comes from our patch because # upstream doesn't want to default to dynamic linking. -ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true javadoc jar contrib-jars javadoc +#ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true javadoc jar contrib-jars +ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true clean dist # remove compiled contribs find contrib -name build -exec rm -rf {} \; || : -sed -i "s/VERSION/%{version}/" pom-%{name}.xml pom-platform.xml %install rm -rf %{buildroot} @@ -151,7 +148,7 @@ install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} -#if 0%{?rhel} >= 6 || 0%{?fedora} >= 9 +#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 9 #%if 0%{?fedora} >= 9 #%ifnarch ppc s390 s390x #%check @@ -206,6 +203,12 @@ rm -rf %{buildroot} %changelog +* Thu Apr 25 2013 Levente Farkas - 3.5.2-1 +- Update to 3.5.2 + +* Mon Oct 29 2012 Levente Farkas - 3.5.1-1 +- Update to 3.5.1 + * Thu Feb 14 2013 Fedora Release Engineering - 3.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild