From df40ab7de7a848929ef361397792c151b50fe509 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mar 20 2013 08:11:39 +0000 Subject: Update to upstream version 1.3 - Remove temporary dependencies on subpackages --- diff --git a/0003-remove-clirr.patch b/0003-remove-clirr.patch deleted file mode 100644 index a5f650e..0000000 --- a/0003-remove-clirr.patch +++ /dev/null @@ -1,87 +0,0 @@ -From c785fcc01e477576bf97aca73fe33a1e424b6985 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Mon, 9 Jan 2012 10:12:54 +0100 -Subject: [PATCH 3/4] remove clirr - ---- - doxia-maven-plugin/pom.xml | 13 ------------- - pom.xml | 26 +------------------------- - 2 files changed, 1 insertions(+), 38 deletions(-) - -diff --git a/doxia-maven-plugin/pom.xml b/doxia-maven-plugin/pom.xml -index 92c6b6e..798b4f6 100644 ---- a/doxia-maven-plugin/pom.xml -+++ b/doxia-maven-plugin/pom.xml -@@ -155,19 +155,6 @@ under the License. - - - -- org.codehaus.mojo -- clirr-maven-plugin -- -- 1.1 -- -- -- org/apache/maven/doxia/logging/** -- org/apache/maven/doxia/sink/** -- org/codehaus/doxia/sink/** -- -- -- -- - org.apache.maven.plugins - maven-plugin-plugin - -diff --git a/pom.xml b/pom.xml -index fe06199..8a71383 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -297,13 +297,6 @@ under the License. - - - -- org.codehaus.mojo -- clirr-maven-plugin -- -- 1.1 -- -- -- - org.apache.maven.plugins - maven-javadoc-plugin - -@@ -342,23 +335,6 @@ under the License. - - - -- -- org.codehaus.mojo -- clirr-maven-plugin -- -- -- verify -- -- check -- -- -- -- org/apache/maven/doxia/document/* -- -- -- -- -- - - - -@@ -508,6 +484,6 @@ under the License. - - - -- -+ - - --- -1.7.7.4 - diff --git a/maven-doxia.spec b/maven-doxia.spec index 3e79cee..6396f42 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -29,8 +29,8 @@ # Name: maven-doxia -Version: 1.2 -Release: 9%{?dist} +Version: 1.3 +Release: 1%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -47,7 +47,6 @@ Patch0: 0001-Use-plexus-component-metadata.patch # will pick it up and try to instantiate Patch1: 0002-doxia-core-remove-plexus-component-annotation.patch -Patch2: 0003-remove-clirr.patch # Build against iText 2.x # http://jira.codehaus.org/browse/DOXIA-53 Patch3: 0004-Fix-itext-dependency.patch @@ -77,7 +76,6 @@ BuildRequires: maven-shared-reporting-impl BuildRequires: maven-doxia-sitetools BuildRequires: maven-doxia-tools BuildRequires: modello-maven-plugin -BuildRequires: servlet25 BuildRequires: classworlds BuildRequires: apache-commons-collections BuildRequires: apache-commons-logging @@ -102,27 +100,8 @@ BuildRequires: geronimo-parent-poms BuildRequires: geronimo-jms BuildRequires: javamail -# Doxia was split into subpackages -- temporarly require all -# subpackages in the main package to ease transition. -# FIXME: remove these -Requires: maven-doxia-book -Requires: maven-doxia-core -Requires: maven-doxia-logging-api -Requires: maven-doxia-maven-plugin -Requires: maven-doxia-module-apt -Requires: maven-doxia-module-confluence -Requires: maven-doxia-module-docbook-simple -Requires: maven-doxia-module-fml -Requires: maven-doxia-module-fo -Requires: maven-doxia-module-itext -Requires: maven-doxia-module-latex -Requires: maven-doxia-module-rtf -Requires: maven-doxia-module-twiki -Requires: maven-doxia-module-xdoc -Requires: maven-doxia-module-xhtml -Requires: maven-doxia-modules -Requires: maven-doxia-sink-api -Requires: maven-doxia-test-docs +Obsoletes: maven-doxia-book < %{epoch}:%{version}-%{release} +Obsoletes: maven-doxia-maven-plugin < %{epoch}:%{version}-%{release} %description @@ -133,12 +112,6 @@ being incorporated into dynamic content generation systems like blogs, wikis and content management systems. -%package book -Summary: Book module for %{name} - -%description book -This package provides %{summary}. - %package core Summary: Core module for %{name} @@ -151,12 +124,6 @@ Summary: Logging-api module for %{name} %description logging-api This package provides %{summary}. -%package maven-plugin -Summary: Maven-plugin module for %{name} - -%description maven-plugin -This package provides %{summary}. - %package module-apt Summary: APT module for %{name} @@ -253,9 +220,18 @@ API documentation for %{name}. %setup -q -n doxia-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 +# we don't have clirr-maven-plugin +%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml + +# use java 5 generics in modello plugin +%pom_xpath_inject "pom:plugin[pom:artifactId[text()='modello-maven-plugin']]"\ +"/pom:executions/pom:execution/pom:configuration" \ +"true" doxia-modules/doxia-module-fml/pom.xml + +# markdown module requires older version (1.0.2) of the pegdown library +%pom_disable_module doxia-module-markdown doxia-modules/pom.xml %build # tests disabled because some use old plexus-container and don't work @@ -268,11 +244,9 @@ API documentation for %{name}. %files -f .mfiles-doxia %doc LICENSE NOTICE -%files book -f .mfiles-doxia-book %files core -f .mfiles-doxia-core %files logging-api -f .mfiles-doxia-logging-api %doc LICENSE NOTICE -%files maven-plugin -f .mfiles-doxia-maven-plugin %files module-apt -f .mfiles-doxia-module-apt %files module-confluence -f .mfiles-doxia-module-confluence %files module-docbook-simple -f .mfiles-doxia-module-docbook-simple @@ -293,6 +267,10 @@ API documentation for %{name}. %changelog +* Tue Mar 19 2013 Michal Srb - 0:1.3-1 +- Update to upstream version 1.3 +- Remove temporary dependencies on subpackages + * Thu Feb 7 2013 Mikolaj Izdebski - 0:1.2-9 - Remove runtime requirement on POM: httpcomponents-project