diff --git a/scala-stm.spec b/scala-stm.spec
index 7d61e95..0399403 100644
--- a/scala-stm.spec
+++ b/scala-stm.spec
@@ -1,29 +1,19 @@
 %global scala_short_version 2.10
 
-%if 0%{?fedora} >= 21
-%global java_pkg java-headless
-%else
-%global java_pkg java
-%endif
-
 Name:          scala-stm
 Version:       0.7
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Software Transactional Memory for Scala
 License:       BSD
 URL:           http://nbronson.github.io/scala-stm/
 Source0:       https://github.com/nbronson/scala-stm/archive/release-%{version}.tar.gz
 
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
 BuildRequires: ant
 BuildRequires: sbt
-
 BuildRequires: mvn(org.scala-lang:scala-compiler)
 BuildRequires: mvn(org.scala-lang:scala-library)
-Requires:      mvn(org.scala-lang:scala-library)
-Requires:      %{java_pkg}
-Requires:      javapackages-tools
+
 BuildArch:     noarch
 
 %description
@@ -58,7 +48,7 @@ rm project/plugins.sbt
 # patch build.sbt
 sed -i -e '/% "test"/d' build.sbt
 sed -i -e '/credentials/d' build.sbt
-sed -i -e 's/\(scalaVersion :=\).*$/scalaVersion := "2.10.3"/' build.sbt
+sed -i -e 's/\(scalaVersion :=\).*$/scalaVersion := "2.10.4"/' build.sbt
 
 # delete tests due to missing deps
 rm -rf src/test
@@ -67,41 +57,33 @@ rm -rf dep-tests
 cp -r /usr/share/sbt/ivy-local .
 mkdir boot
 
-%build
+%mvn_file org.%{name}:%{name}_%{scala_short_version} %{name}
 
-export SBT_BOOT_DIR=boot
-export SBT_IVY_DIR=ivy-local
+%build
 
+export SBT_BOOT_DIR=$PWD/boot
+export SBT_IVY_DIR=$PWD/ivy-local
 sbt package makePom deliverLocal doc
 
-
 # No test deps available
 
-
 %install
-
 # target/scala-2.10/scala-stm_2.10-0.7.jar
-mkdir -p %{buildroot}%{_javadir}
-cp -p target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_artifact target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.pom target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.jar
+%mvn_install -J target/scala-%{scala_short_version}/api/
 
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/scala-%{scala_short_version}/api/* %{buildroot}%{_javadocdir}/%{name}
+%files -f .mfiles
+%doc README RELEASE-NOTES.txt
+%license LICENSE.txt
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt README RELEASE-NOTES.txt
-
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
 
 %changelog
+* Thu Aug 06 2015 gil cattaneo <puntogil@libero.it> 0.7-5
+- fix FTBFS rhbz#1239989
+- Introduce license macro
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild