Attachment 916203 Details for Bug 1107280 – FTBFS in rawhide

[patch] FTBFS in rawhide

0001-FTBFS-in-rawhide-rhbz-1107280.patch (text/plain), 4.32 KB, created by gil cattaneo on 2014-07-07 21:55:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2014-07-07 21:55:29 UTC

Size: 4.32 KB

patch

obsolete

>From 253a8492d57f40259cffc53060d3b6c2d8e03acc Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Mon, 7 Jul 2014 23:43:43 +0200
>Subject: [PATCH] FTBFS in rawhide rhbz#1107280
>
>---
> scalacheck.spec | 66 +++++++++++++++++----------------------------------------
> 1 file changed, 20 insertions(+), 46 deletions(-)
>
>diff --git a/scalacheck.spec b/scalacheck.spec
>index 941933c..35399b0 100644
>--- a/scalacheck.spec
>+++ b/scalacheck.spec
>@@ -6,37 +6,31 @@
> 
> Name:           scalacheck
> Version:        %{scalacheck_version}
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        property-based testing for Scala
>-
> License:        BSD
> URL:            http://www.scalacheck.org
> Source0:        https://github.com/rickynils/scalacheck/archive/%{scalacheck_version}.tar.gz
>-
> %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-tools
>-Requires:	javapackages-tools
>+BuildRequires:  mvn(org.scala-sbt:test-interface)
>+BuildRequires:  javapackages-local
>+Requires:       javapackages-tools
> Requires:       scala
> 
> %description
>@@ -53,9 +47,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,65 +70,47 @@ 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
> 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
>+%mvn_install -J target/doc/main/api
> 
>-mkdir -p %{buildroot}/%{_javadocdir}/%{name}
>-cp -rp target/doc/main/api/* %{buildroot}/%{_javadocdir}/%{name}
>-
>-# 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 LICENSE README.markdown RELEASE
> 
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> %doc LICENSE
> 
> %changelog
>+* Mon Jul 07 2014 gil cattaneo <puntogil@libero.it> 1.11.3-5
>+- FTBFS in rawhide rhbz#1107280
>+
> * 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
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1107280: 906557 | 906558 | 906559 | 916203 | 1059828