diff --git a/.gitignore b/.gitignore index f84196a..8103042 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /maven-reporting-impl-2.2.tar.xz /LICENSE-2.0.txt /maven-reporting-impl-2.3-source-release.zip +/maven-reporting-impl-2.4-source-release.zip diff --git a/0001-Update-to-Doxia-1.6.patch b/0001-Update-to-Doxia-1.6.patch deleted file mode 100644 index 6e870c7..0000000 --- a/0001-Update-to-Doxia-1.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 482abdc1f3887cc9a0f71888fc30bd50547b527a Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 4 Aug 2014 10:31:15 +0200 -Subject: [PATCH] Update to Doxia 1.6 - ---- - pom.xml | 2 +- - src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pom.xml b/pom.xml -index ba0fb78..b880637 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -58,7 +58,7 @@ - - - 2.2.1 -- 1.2 -+ 1.6 - - - -diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java -index ba44b38..ae6b921 100644 ---- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java -+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java -@@ -21,10 +21,10 @@ package org.apache.maven.reporting; - - import org.apache.maven.doxia.sink.Sink; - import org.apache.maven.doxia.sink.SinkFactory; --import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.site.decoration.DecorationModel; - 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.AbstractMojo; --- -1.9.3 - diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index 45d93d3..3a48a1c 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -1,6 +1,6 @@ Name: maven-reporting-impl -Version: 2.3 -Release: 2%{?dist} +Version: 2.4 +Release: 1%{?dist} Summary: Abstract classes to manage report generation License: ASL 2.0 URL: http://maven.apache.org/shared/%{name} @@ -8,9 +8,6 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip -# Forwarded upstream: https://issues.apache.org/jira/browse/MSHARED-344 -Patch0: 0001-Update-to-Doxia-1.6.patch - BuildRequires: maven-local BuildRequires: mvn(commons-validator:commons-validator) BuildRequires: mvn(junit:junit) @@ -43,7 +40,6 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 %build %mvn_build %{!?fedora:-f} @@ -52,6 +48,7 @@ API documentation for %{name}. %mvn_install %files -f .mfiles +%{!?_licensedir:%global license %%doc} %dir %{_javadir}/%{name} %doc LICENSE NOTICE @@ -59,6 +56,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Wed Jul 08 2015 Michal Srb - 2.4-1 +- Update to upstream version 2.4 + * Wed Jun 17 2015 Fedora Release Engineering - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 63e9a02..8cb1555 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -396f1cf5e9f7f2a6eafbfbc41fc457bb maven-reporting-impl-2.3-source-release.zip +358eeed10b3e0059af9b28e7e8a254b9 maven-reporting-impl-2.4-source-release.zip