From a34726f484424096b7ece0dd083cbbd0fbf19971 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 04 2014 06:30:35 +0000
Subject: Fix junit BRs, XMvn changes (#1107359)


---

diff --git a/xsom.spec b/xsom.spec
index a153a61..5795d80 100644
--- a/xsom.spec
+++ b/xsom.spec
@@ -2,7 +2,7 @@
 
 Name: xsom
 Version: 0
-Release: 11.%{checkout}svn%{?dist}
+Release: 12.%{checkout}svn%{?dist}
 Summary: XML Schema Object Model (XSOM)
 Group: Development/Libraries
 License: CDDL or GPLv2 with exceptions
@@ -21,7 +21,7 @@ Source1: http://docs.oasis-open.org/regrep/v3.0/schema/lcm.xsd
 Patch0: %{name}-%{checkout}svn-pom.patch
 
 BuildRequires: jpackage-utils
-BuildRequires: junit4
+BuildRequires: junit
 BuildRequires: maven-local
 BuildRequires: maven-antrun-plugin
 BuildRequires: maven-plugin-build-helper
@@ -32,7 +32,7 @@ BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-shared
 BuildRequires: relaxngDatatype
 BuildRequires: relaxngcc
@@ -104,10 +104,7 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 %doc license.txt
 
 
@@ -117,6 +114,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Aug 04 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0-12.20110809svn
+- Fix junit BRs (#1107359)
+- Fix FTBFS due to F21 XMvn changes
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-11.20110809svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild