rpms/plexus-maven-plugin/devel plexus-maven-plugin-maven-doxia.patch, 1.1.2.1, 1.1.2.2 plexus-maven-plugin.spec, 1.11.2.1, 1.11.2.2

Fernando Nasser fnasser at fedoraproject.org
Thu May 21 00:13:27 UTC 2009 

Author: fnasser

Update of /cvs/extras/rpms/plexus-maven-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27128

Modified Files:
      Tag: private-newmaven-branch
	plexus-maven-plugin-maven-doxia.patch plexus-maven-plugin.spec 
Log Message:
Try to revert to Deepak's original set

plexus-maven-plugin-maven-doxia.patch:

Index: plexus-maven-plugin-maven-doxia.patch
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/Attic/plexus-maven-plugin-maven-doxia.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- plexus-maven-plugin-maven-doxia.patch	20 May 2009 21:51:52 -0000	1.1.2.1
+++ plexus-maven-plugin-maven-doxia.patch	21 May 2009 00:13:26 -0000	1.1.2.2
@@ -43,58 +43,58 @@
  import org.jdom.Element;
  
  /**
---- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav1	2007-10-01 06:35:26.000000000 +0200
-+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2008-06-09 15:08:26.000000000 +0200
-@@ -24,7 +24,7 @@
- 
- package org.codehaus.plexus.maven.plugin.report;
- 
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0	2007-11-22 18:21:17.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2007-11-22 18:21:49.000000000 +0100
+@@ -15,7 +15,7 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
 -import org.codehaus.doxia.sink.Sink;
 +import org.apache.maven.doxia.sink.Sink;
  import org.jdom.Element;
  
- /**
---- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav1	2007-10-01 06:35:26.000000000 +0200
-+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2008-06-09 15:09:59.000000000 +0200
-@@ -28,7 +28,7 @@
- import java.util.Iterator;
- import java.util.List;
+ import java.util.ArrayList;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0	2007-11-22 18:25:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2007-11-22 18:26:46.000000000 +0100
+@@ -17,7 +17,7 @@
+  */
  
+ import org.jdom.Element;
 -import org.codehaus.doxia.sink.Sink;
 +import org.apache.maven.doxia.sink.Sink;
- import org.jdom.Element;
+ import org.codehaus.plexus.util.StringUtils;
  
- /**
---- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav1	2007-10-01 06:35:26.000000000 +0200
-+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2008-06-09 15:11:53.000000000 +0200
+ import java.util.Iterator;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0	2007-11-22 18:29:44.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2007-11-22 18:30:22.000000000 +0100
 @@ -25,7 +25,7 @@
- import java.util.TreeMap;
- import java.util.TreeSet;
+ package org.codehaus.plexus.maven.plugin.report;
  
+ import org.jdom.Element;
 -import org.codehaus.doxia.sink.Sink;
 +import org.apache.maven.doxia.sink.Sink;
- import org.jdom.Element;
  
  /**
---- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav1	2007-10-01 06:35:26.000000000 +0200
-+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2008-06-09 15:13:25.000000000 +0200
-@@ -24,7 +24,7 @@
- 
+  * @author <a href="mailto:trygvis at inamo.no">Trygve Laugst&oslash;l</a>
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0	2007-11-22 18:31:57.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2007-11-22 18:32:14.000000000 +0100
+@@ -25,7 +25,7 @@
  package org.codehaus.plexus.maven.plugin.report;
  
+ import org.jdom.Element;
 -import org.codehaus.doxia.sink.Sink;
 +import org.apache.maven.doxia.sink.Sink;
- import org.codehaus.plexus.util.StringUtils;
- import org.jdom.Element;
  
---- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav1	2007-10-01 06:35:26.000000000 +0200
-+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2008-06-09 15:14:35.000000000 +0200
-@@ -19,7 +19,7 @@
  import java.util.Iterator;
  import java.util.List;
+--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0	2007-11-22 18:34:25.000000000 +0100
++++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2007-11-22 18:34:45.000000000 +0100
+@@ -25,7 +25,7 @@
+ package org.codehaus.plexus.maven.plugin.report;
  
+ import org.jdom.Element;
 -import org.codehaus.doxia.sink.Sink;
 +import org.apache.maven.doxia.sink.Sink;
  import org.codehaus.plexus.util.StringUtils;
- import org.jdom.Element;
  
+ /**


Index: plexus-maven-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-maven-plugin/devel/plexus-maven-plugin.spec,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -p -r1.11.2.1 -r1.11.2.2
--- plexus-maven-plugin.spec	20 May 2009 21:51:52 -0000	1.11.2.1
+++ plexus-maven-plugin.spec	21 May 2009 00:13:26 -0000	1.11.2.2
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define gcj_support 1
 
 %define parent plexus
 %define subname maven-plugin
@@ -37,7 +37,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.3.5
-Release:        5%{?dist}
+Release:        2jpp.1%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        Apache Software License
@@ -46,7 +46,6 @@ URL:            http://plexus.codehaus.o
 # svn export http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.5
 # tar czf plexus-maven-plugin-src.tar.gz plexus-maven-plugin-1.3.5
 Source0:        %{name}-src.tar.gz
-Source1:        %{name}-jpp-depmap.xml
 
 Patch0:         %{name}-maven-doxia.patch
 Patch1:         %{name}-add-jdom-dep.patch
@@ -67,19 +66,16 @@ BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
 BuildRequires:  maven2-common-poms >= 1.0
-BuildRequires:	maven2-plugin-release
-BuildRequires:	maven-doxia
 BuildRequires:  plexus-appserver >= 1.0-0.a5.3
 BuildRequires:  plexus-cdc >= 1.0-0.3.a10
-BuildRequires:  plexus-containers
-BuildRequires:  plexus-containers-container-default
+BuildRequires:  plexus-container-default
 BuildRequires:  plexus-runtime-builder >= 1.0-0.a9.2
 
 Requires:       maven2 >= 2.0.4
 Requires:       maven2-common-poms >= 1.0
 Requires:       plexus-appserver >= 1.0-0.a5.3
 Requires:       plexus-cdc >= 1.0
-Requires:       plexus-containers-container-default
+Requires:       plexus-container-default
 Requires:       plexus-runtime-builder >= 1.0-0.a9.2
 
 Requires(post):    jpackage-utils >= 0:1.7.2
@@ -116,6 +112,7 @@ mvn-jpp \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
@@ -182,15 +179,6 @@ fi
 %doc %{_javadocdir}/*
 
 %changelog
-* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-5
-- reverte to 1.3.5 for building maven2-2..0.8
-
-* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-4
-- rebuild with new maven2 2.0.8 built in bootstrap mode
-
-* Wed Feb 04 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-3
-- rebuild with bootstrap JPP5 mode
-
 * Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.3.5-2jpp.1
 - Import from dbhole's maven 2.0.8 packages, initial building

More information about the scm-commits mailing list