Attachment 904764 Details for Bug 1106222 – patch to fix build

[patch] patch to fix build

0001-Use-.mfiles-to-pick-up-xmvn-metadata.patch (text/plain), 1.22 KB, created by Omair Majid on 2014-06-09 15:29:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Omair Majid

Created: 2014-06-09 15:29:37 UTC

Size: 1.22 KB

patch

obsolete

>From 69e9f7912ae6804d54a694e4322ae35dd4eea867 Mon Sep 17 00:00:00 2001
>From: Omair Majid <omajid@redhat.com>
>Date: Mon, 9 Jun 2014 11:22:41 -0400
>Subject: [PATCH] Use .mfiles to pick up xmvn metadata
>
>Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros. Fixes
>build failure.
>---
> mockito.spec | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/mockito.spec b/mockito.spec
>index dae7900..ad06df2 100644
>--- a/mockito.spec
>+++ b/mockito.spec
>@@ -80,10 +80,8 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.mockito:mockito-all"
> 
>-%files
>+%files -f .mfiles
> %{_javadir}/%{name}.jar
>-%{_mavenpomdir}/JPP-%{name}.pom
>-%{_mavendepmapfragdir}/%{name}
> %doc NOTICE
> %doc LICENSE
> 
>@@ -93,6 +91,11 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %doc NOTICE
> 
> %changelog
>+* Mon Jun 09 2014 Omair Majid <omajid@redhat.com> - 1.9.0-17
>+- Use .mfiles to pick up xmvn metadata
>+- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros
>+- Fix FTBFS
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-17
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106222: 904228 | 904229 | 904230 | 904764