From 07bcedf7c6467afe34f01e074426df7a7b18b40f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Aug 11 2014 12:28:14 +0000 Subject: Update to Maven Doxia 1.6 --- diff --git a/0001-Update-to-Maven-Doxia-1.6.patch b/0001-Update-to-Maven-Doxia-1.6.patch new file mode 100644 index 0000000..4afc262 --- /dev/null +++ b/0001-Update-to-Maven-Doxia-1.6.patch @@ -0,0 +1,30 @@ +From c6e8903a7ed5df9a4e2f7ec212c91da1981161a2 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 11 Aug 2014 14:26:34 +0200 +Subject: [PATCH] Update to Maven Doxia 1.6 + +--- + apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 0394c8a..af97882 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 +@@ -27,12 +27,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; + import org.apache.maven.artifact.resolver.ArtifactResolver; + import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; + import org.apache.maven.artifact.versioning.VersionRange; +-import org.apache.maven.doxia.sink.render.RenderingContext; + import org.apache.maven.doxia.site.decoration.Body; + import org.apache.maven.doxia.site.decoration.DecorationModel; + import org.apache.maven.doxia.site.decoration.Skin; + import org.apache.maven.doxia.siterenderer.Renderer; + import org.apache.maven.doxia.siterenderer.RendererException; ++import org.apache.maven.doxia.siterenderer.RenderingContext; + import org.apache.maven.doxia.siterenderer.SiteRenderingContext; + import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; + import org.apache.maven.plugin.MojoExecutionException; +-- +1.9.3 + diff --git a/apache-rat.spec b/apache-rat.spec index 28ab216..51ebbe3 100644 --- a/apache-rat.spec +++ b/apache-rat.spec @@ -1,6 +1,6 @@ Name: apache-rat Version: 0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Release Audit Tool (RAT) Group: Development/Libraries @@ -8,6 +8,7 @@ License: ASL 2.0 URL: http://creadur.apache.org/rat/ Source0: http://www.apache.org/dist/creadur/%{name}-%{version}/%{name}-%{version}-src.tar.bz2 Patch2: apache-rat-0.8-test.patch +Patch3: 0001-Update-to-Maven-Doxia-1.6.patch BuildArch: noarch BuildRequires: maven-local @@ -87,6 +88,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} %patch2 -p1 -b .test +%patch3 -p1 # apache-rat is a module bundling other RAT modules together and as # such it is not needed. @@ -133,6 +135,9 @@ echo "apache-rat/rat-core apache-rat/rat-tasks" > $RPM_BUILD_ROOT%{_sysconfdir}/ %changelog +* Mon Aug 11 2014 Mikolaj Izdebski - 0.10-6 +- Update to Maven Doxia 1.6 + * Fri Jun 13 2014 Michal Srb - 0.10-5 - Fix FTBFS (Resolves: #1105955)