[scala] Fix issue with jansi.jahr in F-20
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Oct 31 09:30:50 UTC 2013
commit ffa5aea497a97a389e86ce8453cfc7813ceca5a3
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Oct 31 10:30:55 2013 +0100
Fix issue with jansi.jahr in F-20
scala.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/scala.spec b/scala.spec
index e193b41..c7c9933 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,11 +1,14 @@
%global fullversion %{version}
%global release_repository http://nexus.scala-tools.org/content/repositories/releases
%global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots
-%if 0%{?fedora} > 20
+%if 0%{?fedora} > 19
%global jansi_jar %{_javadir}/jansi/jansi.jar
-%global jline2_jar %{_javadir}/jline/jline.jar
%else
%global jansi_jar %{_javadir}/jansi.jar
+%endif
+%if 0%{?fedora} > 20
+%global jline2_jar %{_javadir}/jline/jline.jar
+%else
%global jline2_jar %{_javadir}/jline2.jar
%endif
%global scaladir %{_datadir}/scala
@@ -303,6 +306,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
* Wed Oct 30 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.10.3-6
- Jline2 is now jline in Rawhide
+- Fix an issue with jansi.jar in F-20 (#1025062)
* Tue Oct 22 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.10.3-5
- Fix typo
More information about the scm-commits
mailing list