From 0b96baccceb40173ff0a172b9fc92a0cbe56df4f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Sep 18 2019 08:10:29 +0000 Subject: Update to upstream version 1.9.1 --- diff --git a/.gitignore b/.gitignore index ee0c438..d883227 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ maven-doxia-sitetools-1.0-alpha10-src.tar.gz /doxia-sitetools-1.7.3-source-release.zip /doxia-sitetools-1.7.4-source-release.zip /doxia-sitetools-1.7.5-source-release.zip +/doxia-sitetools-1.9.1-source-release.zip diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec index 5657b66..7b3f4b2 100644 --- a/maven-doxia-sitetools.spec +++ b/maven-doxia-sitetools.spec @@ -1,12 +1,11 @@ -%bcond_with markdown %bcond_without fop %global parent maven-doxia %global subproj sitetools Name: %{parent}-%{subproj} -Version: 1.7.5 -Release: 6%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: Doxia content generation framework License: ASL 2.0 URL: http://maven.apache.org/doxia/ @@ -28,11 +27,9 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-module-fml) %if %{with fop} BuildRequires: mvn(org.apache.maven.doxia:doxia-module-fo) %endif -%if %{with markdown} -BuildRequires: mvn(org.apache.maven.doxia:doxia-module-markdown) -%endif BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xdoc) BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml) +BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml5) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) @@ -97,9 +94,8 @@ API documentation for %{name}. rm -rf $(find -type d -name itext) %pom_remove_dep -r :doxia-module-itext -%if %{without markdown} %pom_remove_dep -r :doxia-module-markdown -%endif + %if %{without fop} %pom_remove_dep -r :doxia-module-fo rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo @@ -114,13 +110,17 @@ rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo %install %mvn_install - %files -f .mfiles %dir %{_javadir}/%{name} +%doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE %changelog +* Mon Sep 02 2019 Marian Koncek - 1.9.1-1 +- Update to upstream version 1.9.1 + * Mon Sep 02 2019 Fabio Valentini - 1.7.5-6 - Disable support for markdown. diff --git a/sources b/sources index ee96db5..35cd41e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doxia-sitetools-1.7.5-source-release.zip) = c15b0fe8325e49594691b54a2728fe43b26a7c012e35e907cd3f27680eb0332ed09d01b307a9a146a4a4780a53136146eb5aa12b0a79ca263dbf62c87e28ce3c +SHA512 (doxia-sitetools-1.9.1-source-release.zip) = 1cb855fde7e313603b9c7574c6f8db66c17ec190325519c0d0cb23a7566ba7eb41bdc5009e4c8a2ce9c069ae1b8781bfdde675d5dfa61097f9db2a6d58a95b46