[maven-changes-plugin] Update to latest upsteam (2.4)
by Stanislav Ochotnicky
commit f2d5c6e6ee1328f2457fa5b4fcafe0beca115cdc
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Mar 7 11:04:34 2011 +0100
Update to latest upsteam (2.4)
- Build with maven 3
- Versionless jars & javadocs
.gitignore | 1 +
maven-changes-plugin.depmap | 7 ++++++
maven-changes-plugin.spec | 47 +++++++++++++++++++-----------------------
sources | 2 +-
4 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 333f55d..79d0e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-changes-plugin-2.3.tar.xz
+/maven-changes-plugin-2.4.tar.xz
diff --git a/maven-changes-plugin.depmap b/maven-changes-plugin.depmap
index 1c5c369..364b8ec 100644
--- a/maven-changes-plugin.depmap
+++ b/maven-changes-plugin.depmap
@@ -1,6 +1,13 @@
<dependencies>
<dependency>
<maven>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.4</version>
+ </maven>
+ </dependency>
+ <dependency>
+ <maven>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>3.0</version>
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index 4c10b04..a500189 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,14 +1,13 @@
-
Name: maven-changes-plugin
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3
-# tar caf maven-changes-plugin-2.3.tar.xz maven-changes-plugin-2.3
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.4
+# tar caf maven-changes-plugin-2.4.tar.xz maven-changes-plugin-2.4
Source0: %{name}-%{version}.tar.xz
Source1: %{name}.depmap
@@ -17,14 +16,13 @@ Source1: %{name}.depmap
Patch0: 0001-xmlrpc3-common-dependency.patch
Patch1: 0002-doxia-1.1-import-fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -74,23 +72,15 @@ API documentation for %{name}.
%patch1 -p1
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests are skipped because package expects old doxia and doesn't work
-# with new one
-mvn-jpp -e \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild -e -X \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
-Dmaven.test.skip=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -98,10 +88,14 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%post
%update_maven_depmap
@@ -109,9 +103,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -120,10 +111,14 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4-1
+- Update to latest upsteam (2.4)
+- Build with maven 3
+- Versionless jars & javadocs
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 63772b5..2af4922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05bff2f973fd15a405a5d86a0dd51ce1 maven-changes-plugin-2.3.tar.xz
+6f29cee146495b6e71c9e0f08acb60a6 maven-changes-plugin-2.4.tar.xz
13 years, 1 month
[maven] Update to 3.0.3
by Stanislav Ochotnicky
commit 49f4ff0cb60ef85fad2336f7de7c431a4aafdb12
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 4 11:23:44 2011 +0100
Update to 3.0.3
- Add ext subdirectory to lib
.gitignore | 1 +
maven.spec | 18 +++++++++++-------
sources | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ae537f..999e76d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/apache-maven-3.0-src.tar.gz
/apache-maven-3.0.2-src.tar.gz
/apache-maven-3.0.3-RC1-src.tar.gz
+/apache-maven-3.0.3-src.tar.gz
diff --git a/maven.spec b/maven.spec
index 4a11793..515150d 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,8 +1,7 @@
-%global ver_add -RC1
Name: maven
Version: 3.0.3
-Release: 0.1.rc1%{?dist}
+Release: 1%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -10,7 +9,7 @@ License: ASL 2.0 and MIT and BSD
URL: http://maven.apache.org/
# Source URL is for testing only, final version will be in different place:
# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
-Source0: https://repository.apache.org/content/repositories/maven-049/org/apache/m...
+Source0: http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
# custom resolver java files
# source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/
@@ -103,7 +102,7 @@ Requires: jpackage-utils
%{summary}.
%prep
-%setup -q -n apache-%{name}-%{version}%{ver_add}
+%setup -q -n apache-%{name}-%{version}%{?ver_add}
%patch150 -p1
%patch200 -p1
@@ -141,12 +140,12 @@ mvn-rpmbuild -e install javadoc:aggregate
mkdir m2home
(cd m2home
tar xvf ../apache-maven/target/*tar.gz
-chmod -x apache-%{name}-%{version}%{ver_add}/conf/settings.xml
+chmod -x apache-%{name}-%{version}%{?ver_add}/conf/settings.xml
)
%install
-export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{ver_add}
+export M2_HOME=$(pwd)/m2home/apache-maven-%{version}%{?ver_add}
# maven2 directory in /usr/share/java
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -207,6 +206,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
sisu/sisu-inject-bean sisu/sisu-inject-plexus maven-wagon/file \
maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api \
xbean/xbean-reflect xerces-j2 jdom xml-commons-apis atinject
+ mkdir ext/
)
################
@@ -256,7 +256,7 @@ for module in maven-aether-provider maven-artifact maven-compat \
maven-settings-builder;do
pushd $module
- install -m 644 target/$module-%{version}%{ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
+ install -m 644 target/$module-%{version}%{?ver_add}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$module.jar
ln -s %{_javadir}/%{name}/$module.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/$module.jar
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$module.pom
%add_to_maven_depmap org.apache.maven $module %{version} JPP/%{name} $module
@@ -308,6 +308,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-1
+- Update to 3.0.3
+- Add ext subdirectory to lib
+
* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-0.1.rc1
- Update to 3.0.3rc1
- Enable tests again
diff --git a/sources b/sources
index 2f98cd8..d151511 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-562a919758f71b8170b1f5a9b34dcccd apache-maven-3.0.3-RC1-src.tar.gz
+09c0b476d8ff2120c673a7fc06bd662a apache-maven-3.0.3-src.tar.gz
13 years, 1 month