diff --git a/maven-doxia-depmap.xml b/maven-doxia-depmap.xml
new file mode 100644
index 0000000..65f5c93
--- /dev/null
+++ b/maven-doxia-depmap.xml
@@ -0,0 +1,15 @@
+
+
+
+ org.codehaus.plexus
+ plexus-container-default
+ 1.0-alpha-30
+
+
+ JPP/plexus
+ containers-container-default
+ 1.0-alpha-34
+
+
+
+
diff --git a/maven-doxia-sitetools-clirr.patch b/maven-doxia-sitetools-clirr.patch
new file mode 100644
index 0000000..64a0a46
--- /dev/null
+++ b/maven-doxia-sitetools-clirr.patch
@@ -0,0 +1,54 @@
+Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-decoration-model and maven-doxia-sitetools-1.1.2.clirr/doxia-decoration-model
+Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-doc-renderer and maven-doxia-sitetools-1.1.2.clirr/doxia-doc-renderer
+Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-site-renderer and maven-doxia-sitetools-1.1.2.clirr/doxia-site-renderer
+diff -u maven-doxia-sitetools-1.1.2/pom.xml maven-doxia-sitetools-1.1.2.clirr/pom.xml
+--- maven-doxia-sitetools-1.1.2/pom.xml 2009-11-30 12:53:09.402277000 +0000
++++ maven-doxia-sitetools-1.1.2.clirr/pom.xml 2010-02-12 15:11:51.822043981 +0000
+@@ -242,14 +242,6 @@
+ 1.1
+
+
+- org.codehaus.mojo
+- clirr-maven-plugin
+- 2.2.2
+-
+- 1.1
+-
+-
+-
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.6.1
+@@ -271,20 +263,6 @@
+
+
+
+-
+-
+- org.codehaus.mojo
+- clirr-maven-plugin
+-
+-
+- verify
+-
+- check
+-
+-
+-
+-
+-
+
+
+
+@@ -351,10 +329,6 @@
+ http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resources/config/doxia_checkstyle.xml
+
+
+-
+- org.codehaus.mojo
+- clirr-maven-plugin
+-
+
+
+
+Common subdirectories: maven-doxia-sitetools-1.1.2/src and maven-doxia-sitetools-1.1.2.clirr/src
diff --git a/maven-doxia-sitetools-disablehtmlunit.patch b/maven-doxia-sitetools-disablehtmlunit.patch
index 4f233b9..035ef72 100644
--- a/maven-doxia-sitetools-disablehtmlunit.patch
+++ b/maven-doxia-sitetools-disablehtmlunit.patch
@@ -1,16 +1,16 @@
-diff -up ./doxia-site-renderer/pom.xml.sav ./doxia-site-renderer/pom.xml
---- ./doxia-site-renderer/pom.xml.sav 2008-06-20 17:27:41.000000000 -0400
-+++ ./doxia-site-renderer/pom.xml 2008-06-20 17:27:53.000000000 -0400
-@@ -86,12 +86,6 @@ under the License.
- doxia-decoration-model
+diff -ur maven-doxia-sitetools-1.1.2.orig/doxia-site-renderer/pom.xml maven-doxia-sitetools-1.1.2/doxia-site-renderer/pom.xml
+--- maven-doxia-sitetools-1.1.2.orig/doxia-site-renderer/pom.xml 2010-02-12 15:13:30.794090593 +0000
++++ maven-doxia-sitetools-1.1.2/doxia-site-renderer/pom.xml 2010-02-12 15:28:19.591028944 +0000
+@@ -147,12 +147,6 @@
+ test-jar
+ test
-
+-
- htmlunit
- htmlunit
-- 1.9
+- 1.13
- test
-
--
- commons-collections
- commons-collections
- 3.2
+
+
+
diff --git a/maven-doxia-sitetools-modello1.0.patch b/maven-doxia-sitetools-modello1.0.patch
new file mode 100644
index 0000000..d69b77e
--- /dev/null
+++ b/maven-doxia-sitetools-modello1.0.patch
@@ -0,0 +1,14 @@
+diff -ur maven-doxia-sitetools-1.1.2.clirr/doxia-decoration-model/pom.xml maven-doxia-sitetools-1.1.2.modello/doxia-decoration-model/pom.xml
+--- maven-doxia-sitetools-1.1.2.clirr/doxia-decoration-model/pom.xml 2010-02-12 15:11:24.815028573 +0000
++++ maven-doxia-sitetools-1.1.2.modello/doxia-decoration-model/pom.xml 2010-02-12 15:14:02.733058654 +0000
+@@ -47,9 +47,7 @@
+ org.codehaus.modello
+ modello-maven-plugin
+
+-
+ src/main/mdo/decoration.mdo
+-
+ 1.0.1
+ 1.0.0
+
+Only in maven-doxia-sitetools-1.1.2.clirr/: maven-doxia-sitetools-1.1.2.clirr
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 7b4784b..6227aea 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -30,23 +30,26 @@
%define parent maven-doxia
%define subproj sitetools
-%define namedversion 1.0-alpha-10
Name: %{parent}-%{subproj}
-Version: 1.0
-Release: 0.2.a10.2%{?dist}
+Version: 1.1.2
+Release: 2%{?dist}
Summary: Doxia content generation framework
License: ASL 2.0
Group: Development/Tools
URL: http://maven.apache.org/doxia/
-# svn export \
-# http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-10/ \
-# maven-doxia-sitetools
-# tar czf maven-doxia-sitetools-1.0-alpha10-src.tar.gz maven-doxia-sitetools/
-Source0: %{name}-1.0-alpha10-src.tar.gz
+# http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2/ \
+# maven-doxia-sitetools-1.1.2
+# tar czf maven-doxia-sitetools-1.1.2.tar.gz maven-doxia-sitetools-1.1.2/
+Source0: %{name}-%{version}.tar.gz
-Patch0: %{name}-disablehtmlunit.patch
+# Point it at the correct plexus-container-default
+Source1: maven-doxia-depmap.xml
+
+Patch0: %{name}-clirr.patch
+Patch1: %{name}-modello1.0.patch
+Patch2: %{name}-disablehtmlunit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,24 +59,27 @@ BuildRequires: maven2 >= 0:2.0.4-9
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
+# BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-doxia >= 1.0-0.3.a10
+BuildRequires: maven-doxia = %{version}
BuildRequires: plexus-maven-plugin >= 0:1.2-2
BuildRequires: modello-maven-plugin >= 0:1.0-0.a8.3
BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
BuildRequires: classworlds
BuildRequires: jakarta-commons-collections
+BuildRequires: jakarta-commons-configuration
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-validator
BuildRequires: junit
BuildRequires: oro
BuildRequires: plexus-container-default
+BuildRequires: plexus-containers-container-default
BuildRequires: plexus-i18n
-BuildRequires: plexus-utils
+BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
BuildRequires: tomcat5
BuildRequires: tomcat5-servlet-2.4-api
@@ -81,14 +87,16 @@ BuildRequires: velocity
Requires: classworlds
Requires: jakarta-commons-collections
+Requires: jakarta-commons-configuration
Requires: jakarta-commons-logging
Requires: jakarta-commons-validator
Requires: junit
-Requires: maven-doxia
+Requires: maven-doxia = %{version}
Requires: oro
Requires: plexus-container-default
+Requires: plexus-containers-container-default
Requires: plexus-i18n
-Requires: plexus-utils
+Requires: plexus-utils >= 1.5.7
Requires: plexus-velocity
Requires: velocity
@@ -106,20 +114,22 @@ content. Doxia can be used to generate static sites in addition to
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
-
-%description javadoc
-API documentation for %{name}.
+# %package javadoc
+# Summary: Javadoc for %{name}
+# Group: Documentation
+#
+# %description javadoc
+# API documentation for %{name}.
%prep
-%setup -q -n %{name}
+%setup -q
-%patch0
+%patch0 -p1
+%patch1 -p1
-# Disable test that needs htmlunit, until we get it in Fedora
-rm -f doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+# Disable tests that need htmlunit, until we get it in Fedora
+%patch2 -p1
+rm -rf doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/
%build
@@ -127,17 +137,20 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
+ -e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.failure.ignore=true \
+ -Dmaven.test.skip=true \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
install
-for dir in doxia*; do
- pushd $dir
- mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- javadoc:javadoc
- popd
-done
+# for dir in doxia*; do
+# pushd $dir
+# mvn-jpp \
+# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+# javadoc:javadoc
+# popd
+# done
%post
%update_maven_depmap
@@ -156,46 +169,55 @@ install -m 644 -p doxia-decoration-model/pom.xml $RPM_BUILD_ROOT%{_datadir}/mave
install -m 644 -p doxia-site-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-site-renderer.pom
install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-doc-renderer.pom
-%add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{namedversion} JPP/%{parent} sitetools
-%add_to_maven_depmap org.apache.maven.doxia doxia-decoration-model %{namedversion} JPP/%{parent} decoration-model
-%add_to_maven_depmap org.apache.maven.doxia doxia-site-renderer %{namedversion} JPP/%{parent} site-renderer
-%add_to_maven_depmap org.apache.maven.doxia doxia-doc-renderer %{namedversion} JPP/%{parent} doc-renderer
+%add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{version} JPP/%{parent} sitetools
+%add_to_maven_depmap org.apache.maven.doxia doxia-decoration-model %{version} JPP/%{parent} decoration-model
+%add_to_maven_depmap org.apache.maven.doxia doxia-site-renderer %{version} JPP/%{parent} site-renderer
+%add_to_maven_depmap org.apache.maven.doxia doxia-doc-renderer %{version} JPP/%{parent} doc-renderer
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
-install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model-%{namedversion}.jar
-install -m 644 -p doxia-site-renderer/target/doxia-site-renderer-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer-%{namedversion}.jar
-install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer-%{namedversion}.jar
+install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model-%{version}.jar
+install -m 644 -p doxia-site-renderer/target/doxia-site-renderer-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer-%{version}.jar
+install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{namedversion}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
+ do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc (all javadocs are contained in the main module docs dir used below)
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer
+# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model
+# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer
+# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer
-cp -pr doxia-decoration-model/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model/
-cp -pr doxia-site-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer/
-cp -pr doxia-doc-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer/
+# cp -pr doxia-decoration-model/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model/
+# cp -pr doxia-site-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer/
+# cp -pr doxia-doc-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_javadir}/%{parent}
-%{_datadir}/maven2/poms/JPP.%{parent}-sitetools.pom
-%{_datadir}/maven2/poms/JPP.%{parent}-decoration-model.pom
-%{_datadir}/maven2/poms/JPP.%{parent}-site-renderer.pom
-%{_datadir}/maven2/poms/JPP.%{parent}-doc-renderer.pom
+%{_javadir}/%{parent}/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
-%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+# %files javadoc
+# %defattr(-,root,root,-)
+# %doc %{_javadocdir}/*
%changelog
+* Wed May 5 2010 Mary Ellen Foster 0:1.1.2-2
+- Add (Build)Requirement maven-shared-reporting-impl,
+ plexus-containers-container-default, jakarta-commons-configuration
+
+* Fri Feb 12 2010 Mary Ellen Foster 0:1.1.2-1
+- Update to 1.1.2
+- Temporarily disable javadoc until maven2-plugin-javadoc is rebuilt against
+ the new doxia
+
* Mon Dec 21 2009 Alexander Kurtakov 1.0-0.2.a10.2
- BR maven-surefire-provider-junit.
diff --git a/sources b/sources
index f5ebff9..6b96f0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e92a63df39ab4e700a26cb267f4c0c0e maven-doxia-sitetools-1.0-alpha10-src.tar.gz
+f85349338cb4fbd56448213692027ba3 maven-doxia-sitetools-1.1.2.tar.gz