[maven-enforcer] Update to upstream version 1.1.1

[Mikolaj Izdebski]

commit 48627a86e6d50f9f3f2a57afb74c9a68001c56b5
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 12 20:24:04 2012 +0200

    Update to upstream version 1.1.1
    
    - Convert patches to POM macro
    - Remove patch for bug 748074, upstreamed

 maven-enforcer.spec |   22 ++++++++++++----------
 sources             |    2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index f211fbd..9313e51 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,6 +1,6 @@
 Name:           maven-enforcer
-Version:        1.0.1
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        Maven Enforcer
 
 Group:          Development/Libraries
@@ -8,11 +8,6 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/enforcer
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{version}/enforcer-%{version}-source-release.zip
 
-#748074 - maven-enforcer-plugin is not compatible with maven3
-Patch0:         %{name}-requirePluginVersions-maven3-compatibility.patch
-Patch1:         %{name}-migration-to-component-metadata.patch
-Patch2:         %{name}-maven3-compat.patch
-
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -84,9 +79,11 @@ This component contains the standard Enforcer Rules.
 %prep
 %setup -q -n enforcer-%{version}
 
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%pom_add_dep org.apache.maven:maven-compat enforcer-rules
+
+sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-component-metadata</artifactId>|" \
+    -e "s|<goal>descriptor</goal>|<goal>generate-metadata</goal>|" \
+    -i enforcer-{api,rules}/pom.xml
 
 %build
 mvn-rpmbuild \
@@ -153,6 +150,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-1
+- Update to upstream version 1.1.1
+- Convert patches to POM macro
+- Remove patch for bug 748074, upstreamed
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 388e8fb..cae9f8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9271d09cb4f2841aed40f5718b34e562  enforcer-1.0.1-source-release.zip
+cbfb104743f6f9c80ee5094bc5ee34c5  enforcer-1.1.1-source-release.zip