From 133e9ec26588956796cabf0d49b1bba36b106f6d Mon Sep 17 00:00:00 2001 From: gil Date: Aug 14 2015 19:39:13 +0000 Subject: fix FTBFS rhbz#1239991 Signed-off-by: Mikolaj Izdebski --- diff --git a/scalaz.spec b/scalaz.spec index 48554bc..9f080bb 100644 --- a/scalaz.spec +++ b/scalaz.spec @@ -9,34 +9,33 @@ # set this to 1 once sbt is available in Fedora %global have_native_sbt 1 -Name: scalaz -Version: %{scalaz_version} -Release: 4%{?dist} -Summary: extension to the core Scala library for functional programming +Name: scalaz +Version: %{scalaz_version} +Release: 5%{?dist} +Summary: Extension to the core Scala library for functional programming -License: BSD -URL: http://typelevel.org -Source0: https://github.com/scalaz/scalaz/archive/v%{scalaz_version}.tar.gz#/%{name}-v%{version}.tar.gz -Source1: https://raw.github.com/willb/climbing-nemesis/master/climbing-nemesis.py +License: BSD +URL: http://typelevel.org +Source0: https://github.com/scalaz/scalaz/archive/v%{scalaz_version}.tar.gz#/%{name}-v%{version}.tar.gz +Source1: https://raw.github.com/willb/climbing-nemesis/master/climbing-nemesis.py -Patch0: scalaz-7.0.0-build.patch +Patch0: scalaz-7.0.0-build.patch -BuildArch: noarch +BuildArch: noarch -BuildRequires: mvn(org.scalacheck:scalacheck_%{scala_short_version}) -BuildRequires: scala +BuildRequires: mvn(org.scalacheck:scalacheck_%{scala_short_version}) +BuildRequires: scala %if %{have_native_sbt} -BuildRequires: sbt +BuildRequires: sbt %endif -BuildRequires: javapackages-tools -Requires: javapackages-tools +BuildRequires: javapackages-tools +Requires: javapackages-tools Requires: scala -Requires: jansi +Requires: jansi %description - Scalaz is a Scala library for functional programming. It provides purely functional data structures to complement those from the Scala standard library. It defines a set of foundational type classes @@ -44,7 +43,7 @@ standard library. It defines a set of foundational type classes of data structures. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. @@ -61,6 +60,8 @@ cp %{SOURCE1} . chmod 755 climbing-nemesis.py sed -i -e 's/1[.]10[.]0/1.11.0/g' project/build.scala +# Improve scala version +sed -i -e 's/2.10.3/2.10.4/g' project/build.scala %if 0%{have_scalacheck} == 0 sed -i -e 's/scalacheckBinding, tests,//g' project/build.scala @@ -77,8 +78,8 @@ cp etc/LICENCE LICENCE cp -r /usr/share/sbt/ivy-local . mkdir boot -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 makePom doc %else @@ -100,6 +101,8 @@ for apidir in $(find . -name api -type d | grep -v ivy-local); do module=$(echo $apidir | cut -f2 -d/) mkdir %{buildroot}/%{_javadocdir}/%{name}/$module cp -rp $apidir/* %{buildroot}/%{_javadocdir}/%{name}/$module +# Remove bundle stuff: e.g. jquery-ui.js jquery.js jquery.layout.js + find %{buildroot}/%{_javadocdir}/%{name}/$module/lib -name "*.js" -print -delete done for pom in $(find . -name %{name}-\*.pom ) ; do @@ -118,14 +121,20 @@ for sub in ${shortnames[@]} ; do done %files -f .mfiles -%dir %{_javadir}/%{name}/ -%doc README.md LICENCE +%dir %{_javadir}/%{name} +%doc README.md +%license LICENSE %files javadoc -%{_javadocdir}/%{name}/ -%doc LICENCE +%{_javadocdir}/%{name} +%license LICENSE %changelog +* Sun Aug 09 2015 gil cattaneo 7.0.0-5 +- fix FTBFS rhbz#1239991 +- fix some rpmlint problem +- introduce license macro + * Fri Jun 19 2015 Fedora Release Engineering - 7.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild