From 63230f47406748b26a71547c060df024cc1b7a48 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 3 Aug 2012 12:02:15 +0200
Subject: [PATCH] Update to upstream version 2.12.1

---
 .gitignore          |  1 +
 maven-surefire.spec | 15 +++++++++------
 sources             |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b8956a5..4d469a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ surefire-2.7.1-source-release.zip
 /surefire-2.9-source-release.zip
 surefire-2.10-source-release.zip
 /surefire-2.12-source-release.zip
+/surefire-2.12.1-source-release.zip
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 68cb399..a816c33 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,8 +1,8 @@
 %global bootstrap 0
 
 Name:           maven-surefire
-Version:        2.12
-Release:        5%{?dist}
+Version:        2.12.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Test framework project
 License:        ASL 2.0
@@ -303,12 +303,9 @@ ln -s %{_javadir}/maven-surefire/maven-plugin.jar \
 ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
       $RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-18
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
+%doc LICENSE NOTICE
 %dir %{_javadir}/maven-surefire
 %{_javadir}/maven-surefire/api.jar
 %{_javadir}/maven-surefire/booter.jar
@@ -368,9 +365,15 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadir}/maven-failsafe-plugin.jar
 
 %files javadoc
+%doc LICENSE NOTICE
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Aug  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.12.1-1
+- Update to upstream version 2.12.1
+- Install LICENSE and NOTICE files
+- Remove RPM bug workaround
+
 * Fri Jul 27 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.12-5
 - Fix build problem and rebuild with target 1.5
 
diff --git a/sources b/sources
index cd90aaa..1e7c9d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3d62f23a88b52fd577105279ff9400d  surefire-2.12-source-release.zip
+451adb828cbda2283fc5d48c26262c89  surefire-2.12.1-source-release.zip