[scannotation] Fix for junit and xmvn changes in F21 (#1107281)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Thu Aug 7 23:08:14 UTC 2014


commit a840935ed5179edcd5ce134f9cf05bf134338f45
Author: Yaakov Selkowitz <yselkowi at redhat.com>
Date:   Thu Aug 7 18:08:09 2014 -0500

    Fix for junit and xmvn changes in F21 (#1107281)

 scannotation.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/scannotation.spec b/scannotation.spec
index 44a3128..8340fb8 100644
--- a/scannotation.spec
+++ b/scannotation.spec
@@ -4,7 +4,7 @@
 
 Name: scannotation
 Version: 1.0.3
-Release:  0.9.%{alphatag}%{?dist}
+Release:  0.10.%{alphatag}%{?dist}
 Summary: A Java annotation scanner
 Group: Development/Libraries
 License: ASL 2.0
@@ -21,7 +21,7 @@ Patch0: %{name}-%{namedversion}-remove-dependencies.patch
 
 BuildArch: noarch
 
-BuildRequires: junit4
+BuildRequires: junit
 BuildRequires: javassist
 
 BuildRequires: jpackage-utils
@@ -31,7 +31,7 @@ BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
 
 Requires: jpackage-utils
 Requires: java-headless
@@ -84,16 +84,16 @@ install -pm 644 %{name}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
 %doc License.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 07 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.0.3-0.10.r12
+- Fix for junit and xmvn changes in F21 (#1107281)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-0.9.r12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list