rpms/maven-doxia-sitetools/devel maven-doxia-sitetools.spec,1.4,1.5

[Deepak Bhole]

Author: dbhole

Update of /cvs/pkgs/rpms/maven-doxia-sitetools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv637

Modified Files:
	maven-doxia-sitetools.spec 
Log Message:

- Rebuild with maven 2.2.1
- Remove modello 1.0 patch




Index: maven-doxia-sitetools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia-sitetools/devel/maven-doxia-sitetools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- maven-doxia-sitetools.spec	6 May 2010 10:24:30 -0000	1.4
+++ maven-doxia-sitetools.spec	17 Jun 2010 15:28:23 -0000	1.5
@@ -33,7 +33,7 @@
 
 Name:           %{parent}-%{subproj}
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -48,8 +48,7 @@ Source0:        %{name}-%{version}.tar.g
 Source1:    maven-doxia-depmap.xml
 
 Patch0:         %{name}-clirr.patch
-Patch1:         %{name}-modello1.0.patch
-Patch2:         %{name}-disablehtmlunit.patch
+Patch1:         %{name}-disablehtmlunit.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -125,10 +124,9 @@ wikis and content management systems.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 # Disable tests that need htmlunit, until we get it in Fedora
-%patch2 -p1
+%patch1 -p1
 rm -rf doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/
 
 %build
@@ -209,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT
 # %doc %{_javadocdir}/*
 
 %changelog
+* Thu Jun 17 2010 Deepak Bhole <dbhole at redhat.com> - 0:1.1.2-3
+- Rebuild with maven 2.2.1
+- Remove modello 1.0 patch
+
 * Wed May  5 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.2-2
 - Add (Build)Requirement maven-shared-reporting-impl,
   plexus-containers-container-default, jakarta-commons-configuration