[maven-doxia-sitetools/f19] Update to upstream version 1.4

[Michal Srb]

commit fc2851ec9b8e578b6c210c1e4c6d290801fa868c
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Apr 29 11:11:12 2013 +0200

    Update to upstream version 1.4
    
    - Remove unneeded patch

 .gitignore                                     |    1 +
 0001-Remove-dependency-on-velocity-tools.patch |   44 ++++++++++++------------
 0003-Migration-to-component-metadata.patch     |   34 ------------------
 maven-doxia-sitetools.spec                     |   11 +++---
 sources                                        |    2 +-
 5 files changed, 30 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd76e0c..8ba0c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-doxia-sitetools-1.0-alpha10-src.tar.gz
 /maven-doxia-sitetools-1.1.3.tar.gz
 /doxia-sitetools-1.2-source-release.zip
 /doxia-sitetools-1.3-source-release.zip
+/doxia-sitetools-1.4-source-release.zip
diff --git a/0001-Remove-dependency-on-velocity-tools.patch b/0001-Remove-dependency-on-velocity-tools.patch
index e90bd26..d8f00e8 100644
--- a/0001-Remove-dependency-on-velocity-tools.patch
+++ b/0001-Remove-dependency-on-velocity-tools.patch
@@ -1,6 +1,6 @@
-From 3c668780c24fb742d96b34a6046ab74cc3f709c5 Mon Sep 17 00:00:00 2001
+From fee413e27bf8d8c85a7e03ba6f92621ad6455cab Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb at redhat.com>
-Date: Tue, 9 Apr 2013 13:31:49 +0200
+Date: Mon, 29 Apr 2013 11:02:31 +0200
 Subject: [PATCH] Remove dependency on velocity-tools
 
 ---
@@ -8,29 +8,29 @@ Subject: [PATCH] Remove dependency on velocity-tools
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
-index f23bd7d..21f0ab2 100644
+index d57d308..a8bb759 100644
 --- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 +++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 @@ -70,8 +70,8 @@ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
- import org.apache.maven.doxia.util.XmlValidator;
- 
- import org.apache.velocity.Template;
-+import org.apache.velocity.VelocityContext;
- import org.apache.velocity.context.Context;
--import org.apache.velocity.tools.ToolManager;
- 
- import org.codehaus.plexus.i18n.I18N;
- import org.codehaus.plexus.logging.AbstractLogEnabled;
-@@ -427,8 +427,7 @@ public class DefaultSiteRenderer
- 
-     private Context createVelocityContext( SiteRendererSink sink, SiteRenderingContext siteRenderingContext )
-     {
--        ToolManager toolManager = new ToolManager( true );
--        Context context = toolManager.createContext();
-+        Context context = new VelocityContext();
- 
-         // ----------------------------------------------------------------------
-         // Data objects
+ import org.apache.maven.doxia.util.XmlValidator;
+ 
+ import org.apache.velocity.Template;
++import org.apache.velocity.VelocityContext;
+ import org.apache.velocity.context.Context;
+-import org.apache.velocity.tools.ToolManager;
+ 
+ import org.codehaus.plexus.component.annotations.Component;
+ import org.codehaus.plexus.component.annotations.Requirement;
+@@ -432,8 +432,7 @@ public class DefaultSiteRenderer
+ 
+     private Context createVelocityContext( SiteRendererSink sink, SiteRenderingContext siteRenderingContext )
+     {
+-        ToolManager toolManager = new ToolManager( true );
+-        Context context = toolManager.createContext();
++        Context context = new VelocityContext();
+ 
+         // ----------------------------------------------------------------------
+         // Data objects
 -- 
 1.8.1.4
 
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index cbfcbc8..ecdd3fb 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -32,8 +32,8 @@
 %global subproj sitetools
 
 Name:           %{parent}-%{subproj}
-Version:        1.3
-Release:        4%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
@@ -42,7 +42,6 @@ URL:            http://maven.apache.org/doxia/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip
 
 
-Patch0:         0003-Migration-to-component-metadata.patch
 Patch1:         0001-Remove-dependency-on-velocity-tools.patch
 
 BuildRequires:  maven-local
@@ -84,8 +83,6 @@ API documentation for %{name}.
 %prep
 %setup -q -n doxia-%{subproj}-%{version}
 
-%patch0 -p1
-
 # upstream added support for velocity toolmanager, but it also means new
 # dependency on velocity-tools. we don't want to depend on this package
 # (it depends on struts 1) so this patch reverts upstream changes
@@ -124,6 +121,10 @@ rm -rf $(find -type d -name itext)
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Apr 29 2013 Michal Srb <msrb at redhat.com> - 1.4-1
+- Update to upstream version 1.4
+- Remove unneeded patch
+
 * Tue Apr  9 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3-4
 - Fix BuildRequires
 
diff --git a/sources b/sources
index 1d7b9ff..fcb792b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35b1e9f852a3ce2d031be949a0fa520e  doxia-sitetools-1.3-source-release.zip
+aeb66c43aaef336f2a8f8cd3773c4fc5  doxia-sitetools-1.4-source-release.zip