Attachment 651099 Details for Bug 879828 – enabled swing module

[patch] enabled swing module

0001-enabled-swing-module-PATCH4.patch (text/plain), 3.36 KB, created by gil cattaneo on 2012-11-24 17:52:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-11-24 17:52:26 UTC

Size: 3.36 KB

patch

obsolete

>From 705ec4df57e3f71c18b67b3b24ad98a23edd2e0c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sat, 24 Nov 2012 18:45:22 +0100
>Subject: [PATCH] enabled swing module (PATCH4)
>
>---
> scala.spec |   24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/scala.spec b/scala.spec
>index 89b5d52..16a1a15 100644
>--- a/scala.spec
>+++ b/scala.spec
>@@ -3,9 +3,12 @@
> %global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots
> %global jline2_jar /usr/share/java/jline2.jar
> %global jansi_jar /usr/share/java/jansi.jar
>+
>+%global scaladir %{_datadir}/scala
>+
> Name:           scala
> Version:        2.9.2
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        A hybrid functional/object-oriented language for the JVM
> BuildArch:      noarch
> Group:          Development/Languages
>@@ -21,7 +24,7 @@ Patch1:		scala-2.9.2-tooltemplate.patch
> Patch2:	        scala-2.9.2-use_system_jline.patch
> # change org.scala-lang jline in org.sonatype.jline jline
> Patch3:	        scala-2.9.2-compiler-pom.patch
>-
>+# taken from https://github.com/scala/scala/tree/java7
> Patch4:	        scala-2.9.2-java7.patch
> 
> Source21:       scala.keys
>@@ -37,7 +40,6 @@ BuildRequires:  ant
> BuildRequires:  ant-contrib
> BuildRequires:  jline2
> BuildRequires:  jpackage-utils
>-# BuildRequires:  maven-ant-tasks
> BuildRequires:  shtool
> Requires:       java
> Requires:       jline2
>@@ -82,8 +84,6 @@ Scala is a general purpose programming language for the JVM that blends
> object-oriented and functional programming. This package contains examples for
> the Scala programming language
> 
>-%define scaladir %{_datadir}/scala
>-
> %prep
> %setup -q -n scala-%{fullversion}-sources
> %patch1 -p1 -b .tool
>@@ -109,13 +109,12 @@ pushd lib
>     rm -rf ant-contrib.jar
>     ln -s $(build-classpath ant.jar) ant.jar
>     ln -s $(build-classpath ant/ant-contrib) ant-contrib.jar
>-#    rm -rf ant-dotnet-1.0.jar
>+#    rm -rf ant-dotnet-1.0.jar http://gil.fedorapeople.org/ant-dotnet-1.1-1.fc16.src.rpm
>     rm -rf maven-ant-tasks-2.1.1.jar
>-#    rm -rf vizant.jar
>+#    rm -rf vizant.jar http://gil.fedorapeople.org/vizant-0.1.2-1.fc16.src.rpm
>   popd
> popd
>-# see https://github.com/scala/scala/pull/1019
>-#sed -i "s|<files includes="${src.dir}/swing"/>||" build.xml
>+#    rm -rf tools/push.jar contains zinc, sbt, dispatch-{core,futures,http}_2.9.1-0.8.6.jar and others java libraries
> 
> %build
> 
>@@ -132,8 +131,8 @@ done
> install -p -m 755 -d $RPM_BUILD_ROOT%{_javadir}/scala
> install -p -m 755 -d $RPM_BUILD_ROOT%{scaladir}/lib
> install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-# TODO scala-swing
>-for libname in scala-compiler scala-dbc scala-library scala-partest scalap ; do
>+
>+for libname in scala-compiler scala-dbc scala-library scala-partest scala-swing scalap ; do
>         install -m 644 build/pack/lib/$libname.jar $RPM_BUILD_ROOT%{_javadir}/scala/
>         shtool mkln -s $RPM_BUILD_ROOT%{_javadir}/scala/$libname.jar $RPM_BUILD_ROOT%{scaladir}/lib
>         sed -i "s|@VERSION@|%{fullversion}|" src/build/maven/$libname-pom.xml
>@@ -195,6 +194,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
> %doc docs/LICENSE
> 
> %changelog
>+* Sat Nov 24 2012 gil cattaneo <puntogil@libero.it> 2.9.2-2
>+- enabled swing module (PATCH4)
>+
> * Thu Sep 13 2012 gil cattaneo <puntogil@libero.it> 2.9.2-1
> - update to 2.9.2
> - added maven poms
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 879828: 651099