Attachment 1290804 Details for Bug 1424418 – Fix spec file to build with scala 2.10.6

[patch] Fix spec file to build with scala 2.10.6

sbt-Fix-spec-file-to-build-with-scala-2.10.6.patch (text/plain), 2.09 KB, created by Troy Dawson on 2017-06-22 19:42:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Troy Dawson

Created: 2017-06-22 19:42:56 UTC

Size: 2.09 KB

patch

obsolete

>From 54cde09ec605d11576b7be30c86f8ba0a94ffae6 Mon Sep 17 00:00:00 2001
>From: Troy Dawson <tdawson@redhat.com>
>Date: Thu, 22 Jun 2017 12:37:18 -0700
>Subject: [PATCH] Fix spec file to build with scala 2.10.6 (#1424418)
>
>---
> sbt.spec | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/sbt.spec b/sbt.spec
>index 3d8f769..13e6fb5 100644
>--- a/sbt.spec
>+++ b/sbt.spec
>@@ -7,7 +7,7 @@
> # build non-bootstrap packages with tests, cross-referenced sources, etc
> %global do_proper 0
> %global pkg_rel 8
>-%global scala_version 2.10.4
>+%global scala_version 2.10.6
> %global scala_short_version 2.10
> %global sbt_bootstrap_version 0.13.1
> %global sbt_major 0
>@@ -49,7 +49,7 @@
> 
> Name:		sbt
> Version:	%{sbt_version}
>-Release:	%{pkg_rel}%{?dist}.2
>+Release:	%{pkg_rel}%{?dist}.3
> Summary:	The simple build tool for Scala and Java projects
> 
> BuildArch:	noarch
>@@ -574,9 +574,6 @@ done
> 
> %endif
> 
>-# remove any references to Scala 2.10.2
>-sed -i -e 's/["]2[.]10[.][23]["]/\"2.10.4\"/g' $(find . -name \*.xml)
>-
> # better not to try and compile the docs project
> rm -f project/Docs.scala
> 
>@@ -601,8 +598,8 @@ for jar in %{_javadir}/scala/*.jar ; do
>    cp --symbolic-link $jar scala/lib
> done
> 
>-sed -i -e 's/["]2[.]10[.][23]["]/\"2.10.4\"/g' $(find . -name \*.sbt -type f) $(find . -name \*.xml) $(find . -name \*.scala)
>-sed -i -e 's/["]2[.]10[.]2-RC2["]/\"2.10.4\"/g' $(find . -name \*.sbt -type f)
>+sed -i -e 's/["]2[.]10[.][234]["]/\"2.10.6\"/g' $(find . -name \*.sbt -type f) $(find . -name \*.xml) $(find . -name \*.scala)
>+sed -i -e 's/["]2[.]10[.]2-RC2["]/\"2.10.6\"/g' $(find . -name \*.sbt -type f)
> 
> # work around proguard bugs with the Scala library
> sed -i -e 's/"-dontnote",/"-dontnote", "-dontshrink", "-dontoptimize",/g' project/Proguard.scala
>@@ -724,6 +721,9 @@ done
> %doc README.md LICENSE NOTICE
> 
> %changelog
>+* Thu Jun 22 2017 Troy Dawson <tdawson@redhat.com> - 0.13.1-8.3
>+- Fix spec file to build with scala 2.10.6 (#1424418)
>+
> * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-8.2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1424418: 1254525 | 1254526 | 1254527 | 1290804