commit b81e0edc8de64e34206750e31164b014062aae29
Author: Jaromír Cápík <jcapik(a)redhat.com>
Date: Wed Jul 20 17:04:45 2011 +0200
Migration to plexus-containers-component-metadata & update to 1.4
maven-doxia-tools-maven3-compat.patch | 15 +++++
...xia-tools-migration-to-component-metadata.patch | 18 ++++++
maven-doxia-tools-update-interpolation.patch | 48 ----------------
maven-doxia-tools.spec | 59 ++++++++-----------
4 files changed, 58 insertions(+), 82 deletions(-)
---
diff --git a/maven-doxia-tools-maven3-compat.patch
b/maven-doxia-tools-maven3-compat.patch
new file mode 100644
index 0000000..a38e598
--- /dev/null
+++ b/maven-doxia-tools-maven3-compat.patch
@@ -0,0 +1,15 @@
+diff -Naur maven-doxia-tools-1.4.orig/pom.xml maven-doxia-tools-1.4/pom.xml
+--- maven-doxia-tools-1.4.orig/pom.xml 2011-07-20 16:23:03.000000000 +0200
++++ maven-doxia-tools-1.4/pom.xml 2011-07-20 16:23:45.267091971 +0200
+@@ -77,6 +77,11 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-doxia-tools-migration-to-component-metadata.patch
b/maven-doxia-tools-migration-to-component-metadata.patch
new file mode 100644
index 0000000..e631eda
--- /dev/null
+++ b/maven-doxia-tools-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur maven-doxia-tools-1.4.orig/pom.xml maven-doxia-tools-1.4/pom.xml
+--- maven-doxia-tools-1.4.orig/pom.xml 2011-06-24 16:57:36.000000000 +0200
++++ maven-doxia-tools-1.4/pom.xml 2011-06-24 17:08:00.322970648 +0200
+@@ -150,12 +150,12 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-doxia-tools.spec b/maven-doxia-tools.spec
index 44a712c..0a7a112 100644
--- a/maven-doxia-tools.spec
+++ b/maven-doxia-tools.spec
@@ -1,16 +1,16 @@
Name: maven-doxia-tools
-Version: 1.2
-Release: 5%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Maven Doxia Integration Tools
Group: Development/Libraries
License: ASL 2.0
URL:
http://maven.apache.org/shared/maven-doxia-tools/
-# svn export
http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.2/
-Source0: %{name}-%{version}.tbz
-Patch0: %{name}-update-interpolation.patch
-
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# svn export
http://svn.apache.org/repos/asf/maven/shared/tags/maven-doxia-tools-1.4/
+# tar caf maven-doxia-tools-1.4.tar.xz maven-doxia-tools-1.4
+Source0: %{name}-%{version}.tar.xz
+Patch0: %{name}-migration-to-component-metadata.patch
+Patch1: %{name}-maven3-compat.patch
BuildRequires: jakarta-commons-io >= 1.4
BuildRequires: jakarta-commons-logging
@@ -18,6 +18,7 @@ BuildRequires: plexus-utils
BuildRequires: plexus-interpolation
BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
+BuildRequires: maven
BuildRequires: maven-shared
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
@@ -29,7 +30,7 @@ BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven-shared-plugin-testing-harness
BuildRequires: maven-shared-reporting-impl
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: java-devel >= 1:1.6.0
BuildArch: noarch
@@ -61,56 +62,46 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp \
+mvn-rpmbuild \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
- install javadoc:javadoc
-
+ install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
-install -m 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+# jars
+install -Dm 644 target/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+# javadoc
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+# poms
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.shared %{name} %{version} JPP %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Fri Jun 24 2011 Jaromir Capik <jcapik(a)redhat.com> 1.4-1
+- Update to 1.4
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Dependency maven-compat introduced
+- Minor spec file changes according to the latest guidelines
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.2-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild