From a48615d1e78927067cdd15d9cf373c986300a3e7 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 28 Jun 2011 12:43:17 +0300
Subject: [PATCH] Update to latest upstream 1.0.1.

Adapt to current guidelines.
---
 .gitignore                |  1 +
 fix-site.patch            | 10 ----------
 maven-enforcer-depmap.xml | 15 ---------------
 maven-enforcer.spec       | 31 +++++++------------------------
 sources                   |  2 +-
 5 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 fix-site.patch
 delete mode 100644 maven-enforcer-depmap.xml

diff --git a/.gitignore b/.gitignore
index 097e0c3..db82974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 enforcer-1.0-beta-2.tar.xz
 /enforcer-1.0.tar.xz
+/enforcer-1.0.1-source-release.zip
diff --git a/fix-site.patch b/fix-site.patch
deleted file mode 100644
index e3ae456..0000000
--- a/fix-site.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/site/site.xml.sav	2009-01-16 15:55:37.000000000 +0200
-+++ src/site/site.xml	2010-05-19 14:38:47.945028586 +0300
-@@ -30,6 +30,6 @@ under the License.
-       <item name="Maven" href="http://maven.apache.org/index.html" />
-       <item name="Enforcer" href="http://maven.apache.org/enforcer/index.html" />
-     </breadcrumbs>
--    <menu ref="modules" />
-+  
-   </body>
- </project>
diff --git a/maven-enforcer-depmap.xml b/maven-enforcer-depmap.xml
deleted file mode 100644
index 71ded20..0000000
--- a/maven-enforcer-depmap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<dependencies>
-	<dependency>
-	  <maven>
-		<groupId>org.codehaus.plexus</groupId>
-		<artifactId>plexus-container-default</artifactId>
-		<version>1.1</version>
-	  </maven>
-	  <jpp>
-		<groupId>JPP/plexus</groupId>
-		<artifactId>container-default</artifactId>
-		<version>1.1</version>
-	  </jpp>
-	</dependency>
-</dependencies>
-
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index fc11002..75a616f 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,17 +1,12 @@
-
 Name:           maven-enforcer
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Maven Enforcer
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/enforcer
-#svn export http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0 enforcer-1.0
-#tar caf enforcer-1.0.tar.xz enforcer-1.0
-Source0:        enforcer-%{version}.tar.xz
-Source1:        %{name}-depmap.xml
-Patch0:         fix-site.patch
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{version}/enforcer-%{version}-source-release.zip
 
 BuildArch: noarch
 
@@ -34,7 +29,6 @@ BuildRequires: maven-site-plugin
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
-BuildRequires: tomcat6
 BuildRequires: plexus-maven-plugin
 BuildRequires: plexus-containers-component-javadoc
 Requires:      maven
@@ -86,16 +80,13 @@ This component contains the standard Enforcer Rules.
 
 %prep
 %setup -q -n enforcer-%{version}
-%patch0
 
 # fix old dep on javadoc taglet
-sed -i 's:<artifactId>plexus-javadoc</artifactId>:<artifactId>plexus-component-javadoc</artifactId>:' pom.xml
 
 %build
 mvn-rpmbuild \
         -e \
-        -Dmaven.local.depmap.file=%{SOURCE1} \
-        -Dmaven.test.failure.ignore=true \
+        -Dmaven.test.skip=true \
         install javadoc:aggregate
 
 %install
@@ -132,12 +123,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %pre javadoc
 # workaround for rpm bug, can be removed in F-17
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
@@ -145,28 +130,27 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %files
-%defattr(-,root,root,-)
 %dir %{_javadir}/%{name}
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %files api
-%defattr(-,root,root,-)
 %{_javadir}/%{name}/enforcer-api*
 
 %files rules
-%defattr(-,root,root,-)
 %{_javadir}/%{name}/enforcer-rules*
 
 %files -n maven-enforcer-plugin
-%defattr(-,root,root,-)
 %{_javadir}/%{name}/plugin*
 
 %changelog
+* Tue Jun 28 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0.1-1
+- Update to latest upstream 1.0.1.
+- Adapt to current guidelines.
+
 * Thu Mar 10 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-1
 - Update to latest upstream (1.0)
 
@@ -180,4 +164,3 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 * Wed May 19 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.1.b2
 - Initial package
-
diff --git a/sources b/sources
index 993749f..388e8fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6a23483fbfdc517f8ebb7dedbfa76a0  enforcer-1.0.tar.xz
+9271d09cb4f2841aed40f5718b34e562  enforcer-1.0.1-source-release.zip