[javasqlite] Depend on headless java where available.
Ville Skyttä
scop at fedoraproject.org
Fri Oct 25 19:47:49 UTC 2013
commit 528382c3beccc561f8e69a9033b4be427c193596
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Oct 25 22:47:54 2013 +0300
Depend on headless java where available.
- Drop aarch64 specfile cruft, rely on %configure (#951442).
javasqlite.spec | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/javasqlite.spec b/javasqlite.spec
index 22e4506..d7b5b5a 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -1,9 +1,12 @@
# javaver nil: build for 1.5.0 and 1.6.0
# javaver something else: build only for that
-%if 0%{?fedora} > 16
+%if 0%{?fedora}
# Java >= 1.7.0 stuff can't coexist in jar with older versions
%global javaver 1.7.0
+%if %{?fedora} > 19
+%global headless -headless
+%endif
%endif
%if 0%{?el6}
@@ -31,15 +34,12 @@ BuildRequires: sqlite-devel >= 3.4
%if 0%{?javaver:1}
BuildRequires: java-%{javaver}-devel
BuildRequires: java-%{javaver}-javadoc
-Requires: jre-%{javaver}
+Requires: jre-%{javaver}%{?headless}
%else
BuildRequires: java-1.6.0-devel
BuildRequires: java-1.6.0-javadoc
BuildRequires: java-1.5.0-devel
-Requires: jre >= 1.5.0
-%endif
-%ifarch aarch64 #925605
-BuildRequires: libtool
+Requires: jre%{?headless} >= 1.5.0
%endif
%description
@@ -49,7 +49,6 @@ SQLite API.
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
BuildArch: noarch
Requires: java-javadoc
@@ -62,9 +61,6 @@ API documentation for %{name}.
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0
sed -i -e 's/\r//g' doc/ajhowto.txt
f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-%ifarch aarch64 #925605
-autoreconf -if
-%endif
%build
@@ -140,6 +136,10 @@ done
%changelog
+* Fri Oct 25 2013 Ville Skyttä <ville.skytta at iki.fi> - 20130214-2
+- Depend on headless java where available.
+- Drop aarch64 specfile cruft, rely on %%configure (#951442).
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20130214-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list