From 85201d29660c6e1212af7fdc55ac620a7b4ed620 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Nov 10 2016 07:03:42 +0000
Subject: Port to current doxia sitetools


---

diff --git a/0001-Port-to-current-doxia-sitetools.patch b/0001-Port-to-current-doxia-sitetools.patch
index d90c0f9..569e3b9 100644
--- a/0001-Port-to-current-doxia-sitetools.patch
+++ b/0001-Port-to-current-doxia-sitetools.patch
@@ -1,26 +1,34 @@
-From a49b2c89cdd8478ac83b8227c10a5da3155e3581 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 23 Jun 2016 12:22:32 +0200
-Subject: [PATCH 1/2] Port to current doxia-sitetools
+From 8f572ac8d4f7f128e224cde92f8c604631ca8548 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 10 Nov 2016 07:59:31 +0100
+Subject: [PATCH] Port to current doxia sitetools
 
 ---
- apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
-index 8d1eae6..01aceb3 100644
+index 8d1eae6..ea25a00 100644
 --- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
 +++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
-@@ -150,8 +150,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
+@@ -89,7 +89,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
+      * @throws MojoFailureException   An error in the plugin configuration was detected.
+      * @throws MojoExecutionException An error occurred while searching for the artifact file.
+      */
+-    private File getSkinArtifactFile() throws MojoFailureException, MojoExecutionException {
++    private Artifact getSkinArtifactFile() throws MojoFailureException, MojoExecutionException {
+         final Skin skin = Skin.getDefaultSkin();
  
-             siteRenderer.generateDocument(writer, sink, siteContext);
+         String version = skin.getVersion();
+@@ -112,7 +112,7 @@ public class RatReportMojo extends AbstractRatMojo implements MavenReport {
+             throw new MojoFailureException("The skin does not exist: " + e.getMessage());
+         }
  
--            siteRenderer.copyResources(siteContext, new File(getProject().getBasedir(), "src/site/resources"),
--                    outputDirectory);
-+            siteRenderer.copyResources(siteContext, outputDirectory);
-         } catch (IOException e) {
-             throw new MojoExecutionException(e.getMessage(), e);
-         } catch (MavenReportException e) {
+-        return artifact.getFile();
++        return artifact;
+     }
+ 
+     /**
 -- 
 2.7.4
 
diff --git a/apache-rat.spec b/apache-rat.spec
index 69e1b78..56aeacb 100644
--- a/apache-rat.spec
+++ b/apache-rat.spec
@@ -1,6 +1,6 @@
 Name:           apache-rat
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Release Audit Tool (RAT)
 
 License:        ASL 2.0
@@ -150,6 +150,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/
 
 
 %changelog
+* Thu Nov 10 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.12-2
+- Port to current doxia sitetools
+
 * Thu Jun 23 2016 Michael Simacek <msimacek@redhat.com> - 0.12-1
 - Update to upstream version 0.12
 - Enable tests