From 12e6a38597698b2ee4466f4c421e96e58d88fea7 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Aug 06 2015 10:12:32 +0000
Subject: fix FTBFS RHBZ#1107280


Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/scalacheck.spec b/scalacheck.spec
index 4a7344a..0ee04f7 100644
--- a/scalacheck.spec
+++ b/scalacheck.spec
@@ -6,7 +6,7 @@
 
 Name:           scalacheck
 Version:        %{scalacheck_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        property-based testing for Scala
 
 License:        BSD
@@ -16,31 +16,26 @@ Source0:        https://github.com/rickynils/scalacheck/archive/%{scalacheck_ver
 %if %{build_style} == %{SBT}
 # remove cross-compilation (not supported for Fedora) and
 # binary-compatibility testing (due to unsupported deps)
-Patch0:		scalacheck-1.11.0-build.patch
+Patch0:        scalacheck-1.11.0-build.patch
 %else
 # We don't generate a POM from the ant build
 Source1:       http://repo1.maven.org/maven2/org/scalacheck/%{name}_%{scala_version}/%{version}/%{name}_%{scala_version}-%{version}.pom
-
 # remove maven-ant-tasks
-Patch0:		scalacheck-1.11.3-ant-build.patch
+Patch0:        scalacheck-1.11.3-ant-build.patch
 %endif
 
-BuildArch:	noarch
+BuildArch:      noarch
 BuildRequires:  scala
-
 %if %{build_style} == %{SBT}
 BuildRequires:  sbt
 %else
-BuildRequires:	ant
+BuildRequires:  ant
 %endif
+BuildRequires:  mvn(org.scala-sbt:test-interface)
+BuildRequires:  javapackages-local
 
-BuildRequires:	mvn(org.scala-sbt:test-interface)
-BuildRequires:	javapackages-tools
-Requires:	javapackages-tools
-Requires:       scala
 
 %description
-
 ScalaCheck is a library written in Scala and used for automated
 property-based testing of Scala or Java programs. ScalaCheck was
 originally inspired by the Haskell library QuickCheck, but has also
@@ -53,9 +48,7 @@ course also use ScalaCheck completely standalone, with its built-in
 test runner.
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-BuildArch:      noarch
 
 %description javadoc
 Javadoc for %{name}.
@@ -78,68 +71,53 @@ mkdir boot
 sed -i -e 's/0[.]13[.]0/0.13.1/g' project/build.properties
 %endif
 
+%mvn_file org.%{name}:%{name}_%{scala_version} %{name}
+
 %build
 
 %if %{build_style} == %{SBT}
-export SBT_BOOT_DIR=boot
-export SBT_IVY_DIR=ivy-local
+export SBT_BOOT_DIR=$PWD/boot
+export SBT_IVY_DIR=$PWD/ivy-local
 sbt package deliverLocal publishM2Configuration
+%mvn_artifact target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.pom target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.jar
 %else
 ant -Dversion=%{version} jar doc
+%mvn_artifact %{SOURCE1} target/%{name}-%{version}.jar
 %endif
 
 %install
 
 %if %{build_style} == %{SBT}
 
-mkdir -p %{buildroot}/%{_javadir}
-mkdir -p %{buildroot}/%{_mavenpomdir}
-
-mkdir -p %{buildroot}/%{_javadocdir}/%{name}
-
-install -pm 644 target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
-install -pm 644 target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.pom %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-cp -rp target/scala-%{scala_version}/api/* %{buildroot}/%{_javadocdir}/%{name}
+%mvn_install -J target/scala-%{scala_version}/api
 
 %else
-mkdir -p %{buildroot}/%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}/%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}/%{_javadocdir}/%{name}
-cp -rp target/doc/main/api/* %{buildroot}/%{_javadocdir}/%{name}
+%mvn_install -J target/doc/main/api
 
-# We only run %check in an ant build at the moment
+# We only run %%check in an ant build at the moment
 %check
 ant test
 
 %endif
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
+%doc README.markdown RELEASE
+%license LICENSE
 
-%doc LICENSE README.markdown RELEASE
-
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
 
 %changelog
+* Thu Aug 06 2015 gil cattaneo <puntogil@libero.it> 1.11.3-6
+- Fix FTBFS RHBZ#1107280
+- Introduce license macro
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-
 * Mon Feb 10 2014 William Benton <willb@redhat.com> - 1.11.3-3
 - rebuild