gil pushed to hawtdispatch (master). "enable scala library"

[notifications at fedoraproject.org]

>From c9ceec73a4d5f42415e3832c1559cfb204c9d0ed Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Tue, 14 Apr 2015 15:18:16 +0200
Subject: enable scala library


diff --git a/hawtdispatch.spec b/hawtdispatch.spec
index 6c26ad6..4195d50 100644
--- a/hawtdispatch.spec
+++ b/hawtdispatch.spec
@@ -1,33 +1,36 @@
 Name:          hawtdispatch
 Version:       1.21
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       The libdispatch style API for Java
 License:       ASL 2.0
 URL:           http://hawtdispatch.fusesource.org/
 Source0:       https://github.com/fusesource/hawtdispatch/archive/%{name}-project-%{version}.tar.gz
 
+BuildRequires: maven-local
+BuildRequires: mvn(asm:asm-tree)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
 %if (0%{?rhel} > 0) || (0%{?fedora} < 21)
 BuildRequires: mvn(org.fusesource:fusesource-pom)
-BuildRequires: objectweb-asm
-BuildRequires: log4j
+BuildRequires: mvn(log4j:log4j)
 %else
 BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
-BuildRequires: objectweb-asm3
-BuildRequires: log4j12
+BuildRequires: mvn(log4j:log4j:1.2.17)
 %endif
 BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf)
 BuildRequires: mvn(org.osgi:org.osgi.compendium)
 BuildRequires: mvn(org.osgi:org.osgi.core)
+BuildRequires: mvn(org.scala-lang:scala-compiler)
+BuildRequires: mvn(org.scala-lang:scala-library)
 
 %if 0
 # unavailable sub module deps
-# scala
-BuildRequires: mvn(net.alchim31.maven:scala-maven-plugin)
-BuildRequires: mvn(org.scala-lang:scala-library)
-BuildRequires: mvn(org.scala-lang.plugins:continuations)
+# scala test deps
 BuildRequires: mvn(org.scalatest:scalatest_2.10.0)
 # scala-2.11
 BuildRequires: mvn(org.scalatest:scalatest_2.11)
+
 # website
 BuildRequires: mvn(org.fusesource.mvnplugins:maven-linkchecker-plugin)
 BuildRequires: mvn(org.fusesource.scalamd:scalamd)
@@ -41,12 +44,6 @@ BuildRequires: mvn(org.scala-tools:maven-scala-plugin)
 BuildRequires: mvn(org.slf4j:slf4j-nop)
 %endif
 
-# test deps
-BuildRequires: mvn(junit:junit)
-
-BuildRequires: maven-local
-BuildRequires: maven-plugin-bundle
-
 BuildArch:     noarch
 
 # Linux C port @ http://nickhutchinson.me/libdispatch
@@ -62,6 +59,12 @@ development.
 
 This package provides the libdispatch style API for Java.
 
+%package scala
+Summary:       The libdispatch style API for Scala
+
+%description scala
+HawtDispatch: The libdispatch style API for Scala.
+
 %package transport
 Summary:       Transport abstractions for HawtDispatch
 
@@ -82,11 +85,40 @@ This package contains javadoc for %{name}.
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:dependencies"
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:resourcesArtifacts"
 
-%pom_disable_module %{name}-scala
 %pom_disable_module %{name}-example
 %pom_disable_module %{name}-website
 %pom_disable_module %{name}-scala-2.11
 
+%pom_remove_plugin net.alchim31.maven:scala-maven-plugin %{name}-scala
+%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin:1.7 %{name}-scala '
+<executions>
+  <execution>
+    <id>compile</id>
+    <phase>process-sources</phase>
+    <configuration>
+      <tasks>
+        <property name="build.compiler" value="extJavac"/>
+        <taskdef resource="scala/tools/ant/antlib.xml" classpathref="maven.plugin.classpath"/>
+        <mkdir dir="target/classes"/>
+        <scalac srcdir="src/main" destdir="target/classes" classpathref="maven.compile.classpath" encoding="UTF-8">
+          <include name="**/*.*"/>
+        </scalac>
+      </tasks>
+    </configuration>
+      <goals>
+        <goal>run</goal>
+      </goals>
+  </execution>
+</executions>
+<dependencies>
+  <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>${scala-version}</version>
+  </dependency>
+</dependencies>'
+%pom_remove_dep org.scalatest: %{name}-scala
+
 %if (0%{?rhel} > 0) || (0%{?fedora} >= 21)
 %pom_xpath_set "pom:properties/pom:asm-version" 3 %{name}
 %pom_xpath_set "pom:properties/pom:asm-version" 3 %{name}-transport
@@ -97,11 +129,16 @@ This package contains javadoc for %{name}.
 
 %mvn_file :%{name} %{name}
 %mvn_file :%{name}-transport %{name}-transport
+%mvn_file :%{name}-scala %{name}-scala
+%mvn_alias :%{name}-scala :%{name}-scala-2.11
 %mvn_package ":%{name}-project" %{name}
 
+# This test @ random fails on koji AssertionFailedError: null
+rm -r hawtdispatch/src/test/java/org/fusesource/hawtdispatch/DispatchSourceTest.java
+
 %build
-# Test fails @ ramdom on ARM builder
-%mvn_build -s -f
+
+%mvn_build -s
 
 %install
 %mvn_install 
@@ -110,6 +147,9 @@ This package contains javadoc for %{name}.
 %doc changelog.md readme.md
 %license license.txt notice.md
 
+%files scala -f .mfiles-%{name}-scala
+%license license.txt notice.md
+
 %files transport -f .mfiles-%{name}-transport
 %license license.txt notice.md
 
@@ -117,6 +157,9 @@ This package contains javadoc for %{name}.
 %license license.txt notice.md
 
 %changelog
+* Mon Apr 13 2015 gil cattaneo <puntogil at libero.it> 1.21-3
+- enable scala library
+
 * Tue Jan 20 2015 gil cattaneo <puntogil at libero.it> 1.21-2
 - introduce license macro
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/hawtdispatch.git/commit/?h=master&id=c9ceec73a4d5f42415e3832c1559cfb204c9d0ed