Merge junit3 and junit4 providers

- Disable dependency on shadefire

maven-surefire.spec

@@ -1,6 +1,6 @@
 Name:           maven-surefire
 Version:        2.12.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        ASL 2.0 and CPL
@@ -9,6 +9,7 @@ URL:            http://maven.apache.org/surefire/
 
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{version}/surefire-%{version}-source-release.zip
 Source2:        http://junit.sourceforge.net/cpl-v10.html
+Source3:        shadefire-depmap.xml
 
 BuildArch:      noarch
 BuildRequires:  apache-commons-lang3
@@ -73,18 +74,14 @@ Provides:               maven-surefire-report-maven-plugin = %{epoch}:%{version}
 Plugin for generating reports from surefire test runs.
 
 %package provider-junit
-Summary:                JUnit3 provider for Maven Surefire
+Summary:                JUnit provider for Maven Surefire
 Obsoletes:              maven2-plugin-surefire-report <= 0:2.0.4O
 Provides:               maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
+Obsoletes:              %{name}-provider-junit4 < %{epoch}:%{version}-%{release}
+Provides:               %{name}-provider-junit4 < %{epoch}:%{version}-%{release}
 
 %description provider-junit
-JUnit3 provider for Maven Surefire.
-
-%package provider-junit4
-Summary:                JUnit4 provider for Maven Surefire
-
-%description provider-junit4
-JUnit4 provider for Maven Surefire.
+JUnit provider for Maven Surefire.
 
 %package provider-testng
 Summary:                TestNG provider for Maven Surefire
@@ -134,7 +131,7 @@ cp -p %{SOURCE2} .
 
 %build
 # tests turned off because they need jmock
-%mvn_build -f -L "(surefire-plugin|report-plugin|junit3|junit4|testng|tests|failsafe-plugin)=>@1"
+%mvn_build -f -D %{SOURCE3} -L "(surefire-plugin|report-plugin|junit|testng|tests|failsafe-plugin)=>@1"
 
 %install
 %mvn_install
@@ -146,8 +143,7 @@ cp -p %{SOURCE2} .
 
 %files plugin -f .mfiles-surefire-plugin
 %files report-plugin -f .mfiles-report-plugin
-%files provider-junit -f .mfiles-junit3
-%files provider-junit4 -f .mfiles-junit4
+%files provider-junit -f .mfiles-junit
 %files provider-testng -f .mfiles-testng
 %files tests -f .mfiles-tests
 %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin
@@ -156,6 +152,10 @@ cp -p %{SOURCE2} .
 %doc LICENSE NOTICE cpl-v10.html
 
 %changelog
+* Fri Dec 14 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-6
+- Merge junit3 and junit4 providers
+- Disable dependency on shadefire
+
 * Mon Dec 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.4-5
 - Enable xmvn auto-requires
 

shadefire-depmap.xml

@@ -0,0 +1,10 @@
+<dependency>
+  <maven>
+    <groupId>org.apache.maven.surefire</groupId>
+    <artifactId>surefire-shadefire</artifactId>
+  </maven>
+  <jpp>
+    <groupId>JPP/maven</groupId>
+    <artifactId>empty-dep</artifactId>
+  </jpp>
+</dependency>