[java-sig-commits] [maven-doxia-tools] Various updates.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Sep 27 08:40:03 UTC 2011
commit c668e154ac17ee654043a45e88d3418b1a2380a8
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue Sep 27 11:38:59 2011 +0300
Various updates.
- Install license as doc.
- Use new package names.
- Merge and update patches.
- Use new macro
.gitignore | 1 +
maven-doxia-tools-maven3-compat.patch | 15 ------
...xia-tools-migration-to-component-metadata.patch | 47 ++++++++++++--------
maven-doxia-tools.spec | 44 +++++++++---------
sources | 2 +-
5 files changed, 53 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa966d0..c6d2c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-doxia-tools-1.2.tbz
+maven-doxia-tools-1.4-source-release.zip
diff --git a/maven-doxia-tools-migration-to-component-metadata.patch b/maven-doxia-tools-migration-to-component-metadata.patch
index e631eda..114554a 100644
--- a/maven-doxia-tools-migration-to-component-metadata.patch
+++ b/maven-doxia-tools-migration-to-component-metadata.patch
@@ -1,18 +1,29 @@
-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>
+--- pom.xml.sav 2011-04-30 23:20:18.000000000 +0300
++++ pom.xml 2011-09-27 11:30:31.469299395 +0300
+@@ -75,6 +75,11 @@
+ </dependency>
+
+ <!-- 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>
+@@ -174,12 +179,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 0a7a112..1877054 100644
--- a/maven-doxia-tools.spec
+++ b/maven-doxia-tools.spec
@@ -1,19 +1,16 @@
Name: maven-doxia-tools
Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?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.4/
-# tar caf maven-doxia-tools-1.4.tar.xz maven-doxia-tools-1.4
-Source0: %{name}-%{version}.tar.xz
+Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch0: %{name}-migration-to-component-metadata.patch
-Patch1: %{name}-maven3-compat.patch
-BuildRequires: jakarta-commons-io >= 1.4
-BuildRequires: jakarta-commons-logging
+BuildRequires: apache-commons-io >= 1.4
+BuildRequires: apache-commons-logging
BuildRequires: plexus-utils
BuildRequires: plexus-interpolation
BuildRequires: plexus-container-default
@@ -22,20 +19,20 @@ BuildRequires: maven
BuildRequires: maven-shared
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-shared-reporting-impl
BuildRequires: plexus-containers-component-metadata
BuildRequires: java-devel >= 1:1.6.0
BuildArch: noarch
-Requires: jakarta-commons-io >= 1.4
+Requires: apache-commons-io >= 1.4
Requires: plexus-utils
Requires: plexus-interpolation
Requires: plexus-container-default
@@ -61,16 +58,11 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -b .sav
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
mvn-rpmbuild \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -85,17 +77,25 @@ cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
# poms
install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.shared %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE DEPENDENCIES
%files javadoc
%doc %{_javadocdir}/*
+%doc LICENSE
%changelog
+* Tue Sep 27 2011 Alexander Kurtakov <akurtako at redhat.com> 1.4-2
+- Install license as doc.
+- Use new package names.
+- Merge and update patches.
+- Use new macro
+
* Fri Jun 24 2011 Jaromir Capik <jcapik at redhat.com> 1.4-1
- Update to 1.4
- Migration from plexus-maven-plugin to plexus-containers-component-metadata
diff --git a/sources b/sources
index ec30c8e..96f67d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b7e4b311421b11f2c6027d05bc75081 maven-doxia-tools-1.2.tbz
+a588119a2815f64e75d4edd7bb60b79c maven-doxia-tools-1.4-source-release.zip
More information about the java-sig-commits
mailing list