Attachment 916198 Details for Bug 1107447 – fix FTBFS in rawhide

[patch] fix FTBFS in rawhide

0001-FTBFS-in-rawhide-rhbz-1107447.patch (text/plain), 2.21 KB, created by gil cattaneo on 2014-07-07 21:31:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2014-07-07 21:31:23 UTC

Size: 2.21 KB

patch

obsolete

>From 0cf62ee1e3013cc195c8677afd193dc399ea5a9c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Mon, 7 Jul 2014 23:29:23 +0200
>Subject: [PATCH] FTBFS in rawhide rhbz#1107447
>
>---
> test-interface.spec | 33 ++++++++++++---------------------
> 1 file changed, 12 insertions(+), 21 deletions(-)
>
>diff --git a/test-interface.spec b/test-interface.spec
>index c9ca115..fe54438 100644
>--- a/test-interface.spec
>+++ b/test-interface.spec
>@@ -3,7 +3,7 @@
> 
> Name:           test-interface
> Version:        %{test_interface_version}
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        Uniform interface to Scala and Java test frameworks
> 
> License:        BSD
>@@ -19,7 +19,7 @@ BuildRequires:  sbt
> %else
> BuildRequires:	java-devel
> %endif
>-BuildRequires:	javapackages-tools
>+BuildRequires:	javapackages-local
> Requires:	javapackages-tools
> 
> %description
>@@ -51,6 +51,8 @@ cp -p %{SOURCE1} pom.xml
> # Remove unavailable test dep
> %pom_remove_dep :scalatest_2.10
> 
>+%mvn_file org.scala-sbt:%{name} %{name}
>+
> %endif
> 
> %build
>@@ -83,37 +85,26 @@ EOF
> 
> cp pom.xml target/%{name}-%{version}.pom
> 
>+%mvn_artifact target/%{name}-%{version}.pom target/%{name}-%{version}.jar
>+
> %endif
> 
> %install
>-mkdir -p %{buildroot}/%{_javadir}
>-mkdir -p %{buildroot}/%{_mavenpomdir}
>-
>-mkdir -p %{buildroot}/%{_javadocdir}/%{name}
>-
>-install -pm 644 target/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
>-install -pm 644 target/%{name}-%{version}.pom %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
>-
>-cp -rp target/api/* %{buildroot}/%{_javadocdir}/%{name}
>-
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar
>-
>-%files
>-%{_javadir}/%{name}.jar
>-%{_mavenpomdir}/JPP-%{name}.pom
>-%{_mavendepmapfragdir}/%{name}
>+%mvn_install -J target/api
> 
>+%files -f .mfiles
> %doc LICENSE README
> 
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> %doc LICENSE
> 
> %changelog
>+* Mon Jul 07 2014 gil cattaneo <puntogil@libero.it> 1.0-5
>+- FTBFS in rawhide rhbz#1107447
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-
> * Thu Jan 30 2014 William Benton <willb@redhat.com> - 1.0-3
> - fixed typo in generated manifest
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1107447: 906929 | 906930 | 906931 | 916198