[maven-doxia/openjdk-segv] Update/remove patches. Fix AbstractParser being instantiated

[Stanislav Ochotnicky]

commit 74a6c71b20a7a0dfad157b4617dee19a1637dfb6
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Sep 22 11:24:11 2010 +0200

    Update/remove patches. Fix AbstractParser being instantiated

 ...a-core-remove-plexus-component-annotation.patch |   16 ++++++++--------
 maven-doxia-skip-plugin.patch                      |   11 -----------
 maven-doxia.spec                                   |   12 ++++++++----
 3 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/maven-doxia-core-add-default-role-hint.patch b/maven-doxia-core-remove-plexus-component-annotation.patch
similarity index 62%
rename from maven-doxia-core-add-default-role-hint.patch
rename to maven-doxia-core-remove-plexus-component-annotation.patch
index dadb726..7afdde7 100644
--- a/maven-doxia-core-add-default-role-hint.patch
+++ b/maven-doxia-core-remove-plexus-component-annotation.patch
@@ -1,25 +1,25 @@
-From 10861fa2990e898a7810aff5b713f3e0301035c8 Mon Sep 17 00:00:00 2001
+From 1d542d1218f63c07c4972cbed4ec52c61ca9f659 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky at redhat.com>
 Date: Tue, 7 Sep 2010 17:03:29 +0200
-Subject: [PATCH 2/3] doxia-core add default role-hint
+Subject: [PATCH 2/3] doxia-core remove plexus component annotation
 
+Abstract class can't be plexus component
 ---
- .../apache/maven/doxia/parser/AbstractParser.java  |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ .../apache/maven/doxia/parser/AbstractParser.java  |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
-index 11419c1..8c94ff4 100644
+index 11419c1..4543a0c 100644
 --- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
 +++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
-@@ -38,7 +38,7 @@ import org.apache.maven.doxia.sink.Sink;
+@@ -38,7 +38,6 @@ import org.apache.maven.doxia.sink.Sink;
   * @author Jason van Zyl
   * @version $Id: AbstractParser.java 946932 2010-05-21 08:36:30Z ltheussl $
   * @since 1.0
 - * @plexus.component
-+ * @plexus.component role-hint="default"
   */
  public abstract class AbstractParser
      implements Parser
 -- 
-1.7.2.2
+1.7.2.3
 
diff --git a/maven-doxia.spec b/maven-doxia.spec
index d7cf32d..9468922 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -30,7 +30,7 @@
 
 Name:           maven-doxia
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -53,10 +53,11 @@ Patch1:         %{name}-remove-clirr.patch
 Patch2:         %{name}-Use-plexus-component-metadata.patch
 
 Patch3:         %{name}-assert.patch
-Patch4:         %{name}-skip-plugin.patch
 
 # TODO: push upstream
-Patch5:         %{name}-core-add-default-role-hint.patch
+# abstract class should not be annotated as component because maven
+# will pick it up and try to instantiate
+Patch5:         %{name}-core-remove-plexus-component-annotation.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -143,7 +144,6 @@ API documentation for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
 %patch5 -p1
 
 #rm -fr doxia-maven-plugin
@@ -232,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Sep 22 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.1.3-2
+- Remove old skip-plugin patch
+- Replace add-default-role-hint patch with remove-plexus-component patch
+
 * Tue Sep  7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.1.3-1
 - New bugfix version
 - Fix javadoc generation error