From a4c3180ba1fe337a95e107245982c19ba200f7f7 Mon Sep 17 00:00:00 2001 From: Omair Majid 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 - 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 - 1.9.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild