[javapackages-tools] Update to upstream version 0.11.0
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Jan 23 12:58:41 UTC 2013
commit 4100124e222d33a1219760c937564aff17cdc3a9
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Jan 23 13:58:05 2013 +0100
Update to upstream version 0.11.0
- Add mvn-local and mvn-rpmbuild scripts
.gitignore | 1 +
javapackages-tools.spec | 17 +++++++++++------
sources | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 504d1ec..104adaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/javapackages-0.9.1.tar.xz
/javapackages-0.10.0.tar.xz
/javapackages-0.10.1.tar.xz
+/javapackages-0.11.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 0594211..657abe4 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.10.1
+Version: 0.11.0
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -22,7 +22,8 @@ This package provides macros and scripts to support Java packaging.
%package -n maven-local
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
-Requires: maven
+Requires: maven >= 3.0.4-28
+Requires: xmvn >= 0.2.5-1
# POM files needed by maven itself
Requires: apache-commons-parent
Requires: apache-parent
@@ -33,8 +34,6 @@ Requires: plexus-components-pom
Requires: plexus-pom
Requires: plexus-tools-pom
Requires: sonatype-oss-parent
-# Don't pull in xmvn yet, add it later on
-#Requires: xmvn
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
@@ -49,6 +48,7 @@ This package provides macros and scripts to support packaging Maven artifacts.
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-utils
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/maven
install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
@@ -61,8 +61,8 @@ install -p -m 644 depgenerators/fileattrs/maven.attr $RPM_BUILD_ROOT%{_rpmconfig
install -p -m 644 depgenerators/fileattrs/osgi.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
install -p -m 644 depgenerators/fileattrs/javadoc.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 macros.fjava $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -p -m 644 macros.xmvn $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -p -m 644 macros.* $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -p -m 644 metadata/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/maven
install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
@@ -100,10 +100,15 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
%files -n maven-local
%{_mavendepmapfragdir}/%{name}
%config(noreplace) %{_sysconfdir}/rpm/macros.xmvn
+%config(noreplace) %{_sysconfdir}/maven/*.xml
%{_bindir}/mvn-*
%changelog
+* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.11.0-1
+- Update to upstream version 0.11.0
+- Add mvn-local and mvn-rpmbuild scripts
+
* Mon Jan 21 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10.1-1
- Update to upstream version 0.10.1
diff --git a/sources b/sources
index 513bdea..2d60520 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-792152a3d3b53169685297b8efe33197 javapackages-0.10.1.tar.xz
+93ea4593be815365c26e4424bcfd0771 javapackages-0.11.0.tar.xz
More information about the scm-commits
mailing list