Remove legacy cruft

This commit is contained in:
Mikolaj Izdebski 2015-06-10 10:28:59 +02:00
parent 49cd85e9e5
commit 5ae2370844

View File

@ -2,8 +2,6 @@ Name: jna
Version: 4.1.0 Version: 4.1.0
Release: 7%{?dist} Release: 7%{?dist}
Summary: Pure Java access to native libraries Summary: Pure Java access to native libraries
Group: Development/Libraries
License: LGPLv2+ License: LGPLv2+
URL: https://jna.dev.java.net/ URL: https://jna.dev.java.net/
# The source for this package was pulled from upstream's vcs. Use the # The source for this package was pulled from upstream's vcs. Use the
@ -30,13 +28,10 @@ Patch3: jna-3.5.2-gcj-javadoc.patch
Patch4: jna-4.1.0-junit.patch Patch4: jna-4.1.0-junit.patch
Patch6: jna-4.0.0-ffi.patch Patch6: jna-4.0.0-ffi.patch
Patch7: jna-4.0.0-fix-native-test.patch Patch7: jna-4.0.0-fix-native-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# We manually require libffi because find-requires doesn't work # We manually require libffi because find-requires doesn't work
# inside jars. # inside jars.
Requires: java, jpackage-utils, libffi Requires: java, jpackage-utils, libffi
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
BuildRequires: java-devel, jpackage-utils, libffi-devel BuildRequires: java-devel, jpackage-utils, libffi-devel
BuildRequires: ant, ant-junit, junit BuildRequires: ant, ant-junit, junit
BuildRequires: libX11-devel, libXt-devel BuildRequires: libX11-devel, libXt-devel
@ -53,7 +48,6 @@ of use take priority.
%package javadoc %package javadoc
Summary: Javadocs for %{name} Summary: Javadocs for %{name}
Group: Documentation
BuildArch: noarch BuildArch: noarch
@ -63,9 +57,7 @@ This package contains the javadocs for %{name}.
%package contrib %package contrib
Summary: Contrib for %{name} Summary: Contrib for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-examples
BuildArch: noarch BuildArch: noarch
@ -109,8 +101,6 @@ ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native dist
find contrib -name build -exec rm -rf {} \; || : find contrib -name build -exec rm -rf {} \; || :
%install %install
rm -rf %{buildroot}
# jars # jars
install -D -m 644 build/%{name}-min.jar %{buildroot}%{_javadir}/%{name}.jar install -D -m 644 build/%{name}-min.jar %{buildroot}%{_javadir}/%{name}.jar
install -d -m 755 %{buildroot}%{_javadir}/%{name} install -d -m 755 %{buildroot}%{_javadir}/%{name}
@ -138,17 +128,12 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
#ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true test #ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true test
%clean
rm -rf %{buildroot}
%files -f .mfiles %files -f .mfiles
%doc LICENSE OTHERS README.md CHANGES.md TODO %doc LICENSE OTHERS README.md CHANGES.md TODO
%{_libdir}/%{name} %{_libdir}/%{name}
%files javadoc %files javadoc
%defattr(-,root,root,-)
%doc LICENSE %doc LICENSE
%{_javadocdir}/%{name} %{_javadocdir}/%{name}