update to 3.5.2
This commit is contained in:
parent
aae7ccd964
commit
bec1ff3e6b
21
jna.spec
21
jna.spec
@ -1,6 +1,6 @@
|
|||||||
Name: jna
|
Name: jna
|
||||||
Version: 3.5.0
|
Version: 3.5.2
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Pure Java access to native libraries
|
Summary: Pure Java access to native libraries
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -14,8 +14,6 @@ URL: https://jna.dev.java.net/
|
|||||||
# rm -rf jna-%{version}/{dist/*,www}
|
# rm -rf jna-%{version}/{dist/*,www}
|
||||||
# tar cjf ~/rpm/SOURCES/jna-%{version}.tar.bz2 jna-%{version}
|
# tar cjf ~/rpm/SOURCES/jna-%{version}.tar.bz2 jna-%{version}
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source1: pom-%{name}.xml
|
|
||||||
Source2: pom-platform.xml
|
|
||||||
Patch0: jna-3.5.0-build.patch
|
Patch0: jna-3.5.0-build.patch
|
||||||
# This patch is Fedora-specific for now until we get the huge
|
# This patch is Fedora-specific for now until we get the huge
|
||||||
# JNI library location mess sorted upstream
|
# 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 .
|
chmod -Rf a+rX,u+w,g-w,o-w .
|
||||||
%patch3 -p0 -b .gcj-javadoc
|
%patch3 -p0 -b .gcj-javadoc
|
||||||
%patch4 -p1 -b .junit
|
%patch4 -p1 -b .junit
|
||||||
cp %{SOURCE1} %{SOURCE2} ./
|
|
||||||
|
|
||||||
# UnloadTest fail during build since we modify class loading
|
# UnloadTest fail during build since we modify class loading
|
||||||
rm test/com/sun/jna/JNAUnloadTest.java
|
rm test/com/sun/jna/JNAUnloadTest.java
|
||||||
# current bug: https://jna.dev.java.net/issues/show_bug.cgi?id=155
|
# 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
|
# all java binaries must be removed from the sources
|
||||||
#find . -name '*.jar' -delete
|
#find . -name '*.jar' -delete
|
||||||
@ -112,10 +109,10 @@ chmod -c 0644 LICENSE OTHERS CHANGES.md
|
|||||||
%build
|
%build
|
||||||
# We pass -Ddynlink.native which comes from our patch because
|
# We pass -Ddynlink.native which comes from our patch because
|
||||||
# upstream doesn't want to default to dynamic linking.
|
# 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
|
# remove compiled contribs
|
||||||
find contrib -name build -exec rm -rf {} \; || :
|
find contrib -name build -exec rm -rf {} \; || :
|
||||||
sed -i "s/VERSION/%{version}/" pom-%{name}.xml pom-platform.xml
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
@ -151,7 +148,7 @@ install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
|||||||
cp -a doc/javadoc/* %{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
|
#%if 0%{?fedora} >= 9
|
||||||
#%ifnarch ppc s390 s390x
|
#%ifnarch ppc s390 s390x
|
||||||
#%check
|
#%check
|
||||||
@ -206,6 +203,12 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 25 2013 Levente Farkas <lfarkas@lfarkas.org> - 3.5.2-1
|
||||||
|
- Update to 3.5.2
|
||||||
|
|
||||||
|
* Mon Oct 29 2012 Levente Farkas <lfarkas@lfarkas.org> - 3.5.1-1
|
||||||
|
- Update to 3.5.1
|
||||||
|
|
||||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0-2
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user