rpms/maven-doxia/devel maven-doxia.spec,1.26,1.27
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue May 25 14:13:32 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16504/devel
Modified Files:
maven-doxia.spec
Log Message:
- Update for transitional maven state.
- Install doxia-modules pom.
Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- maven-doxia.spec 5 May 2010 15:53:53 -0000 1.26
+++ maven-doxia.spec 25 May 2010 14:13:31 -0000 1.27
@@ -30,7 +30,7 @@
Name: maven-doxia
Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -66,15 +66,17 @@ BuildRequires: itext >= 2.1.7-4
BuildRequires: plexus-cli >= 1.2-8
BuildRequires: maven2 >= 0:2.0.4-9
BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-# BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-plugin
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-doxia-tools
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
@@ -82,7 +84,7 @@ BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: tomcat5
BuildRequires: classworlds
BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-logging
+BuildRequires: apache-commons-logging
BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-commons-configuration
BuildRequires: junit
@@ -91,12 +93,13 @@ BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
+BuildRequires: plexus-build-api
BuildRequires: velocity
BuildRequires: fop
Requires: classworlds
Requires: jakarta-commons-collections
-Requires: jakarta-commons-logging
+Requires: apache-commons-logging
Requires: jakarta-commons-validator
Requires: junit
Requires: oro
@@ -119,12 +122,12 @@ content. Doxia can be used to generate s
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.
-# %package javadoc
-# Summary: Javadoc for %{name}
-# Group: Development/Documentation
-#
-# %description javadoc
-# API documentation for %{name}.
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Development/Documentation
+
+%description javadoc
+API documentation for %{name}.
%prep
%setup -q
@@ -137,9 +140,10 @@ wikis and content management systems.
# rm -rf doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc
# rm -f doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
-%patch5 -p1
%patch6 -p1
+rm -fr doxia-maven-plugin
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
@@ -149,7 +153,7 @@ mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
- install
+ install javadoc:javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -185,6 +189,8 @@ done
# Install parent pom
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
%add_to_maven_depmap org.apache.maven.doxia doxia %{version} JPP/maven-doxia doxia
+install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-modules.pom
+%add_to_maven_depmap org.apache.maven.doxia doxia-modules %{version} JPP/maven-doxia modules
install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib
ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar
@@ -193,11 +199,15 @@ ln -s %{_javadir}/maven-doxia/logging-ap
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}-%{version}
-# cp -pr target/site/apidocs/* \
-# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-# ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -fr doxia-modules
+rm -fr doxia-test-docs
+for dir in doxia*; do
+ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
+ cp -pr $dir/target/site/apidocs/* \
+ %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
+done
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -215,11 +225,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mavendepmapfragdir}/*
%{_datadir}/maven2/lib/*
-# %files javadoc
-# %defattr(-,root,root,-)
-# %doc %{_javadocdir}/*
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
%changelog
+* Tue May 25 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-3
+- Update for transitional maven state.
+- Install doxia-modules pom.
+
* Wed May 5 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.2-2
- Add BuildRequirement on fop
More information about the scm-commits
mailing list