[tycho] Switch to using %%mvn_build.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Dec 9 13:00:22 UTC 2013
commit a02f050792d098e3cb8e01efee42bf7ac84ec930
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Dec 9 15:00:19 2013 +0200
Switch to using %%mvn_build.
- Update BR/R names.
- Adapt to asm5.
tycho.spec | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index a9c291d..15428c9 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.19.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -44,7 +44,6 @@ Patch7: %{name}-fix-bootstrap-build.patch
BuildArch: noarch
-BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-clean-plugin
@@ -55,15 +54,14 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-shared-verifier
-BuildRequires: maven-shared-osgi
+BuildRequires: maven-verifier
+BuildRequires: maven-osgi
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: objectweb-asm4
+BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-metadata
BuildRequires: decentxml
-BuildRequires: easymock3
+BuildRequires: easymock
BuildRequires: ecj
BuildRequires: maven-plugin-testing-harness
%if ! %{bootstrap}
@@ -73,14 +71,13 @@ BuildRequires: %{name}
BuildRequires: maven-shared-utils
BuildRequires: mockito
-Requires: jpackage-utils
Requires: decentxml
Requires: maven-local
Requires: maven-clean-plugin
Requires: maven-dependency-plugin
-Requires: maven-shared-verifier
-Requires: maven-surefire-provider-junit4
-Requires: objectweb-asm4
+Requires: maven-verifier
+Requires: maven-surefire-provider-junit
+Requires: objectweb-asm
Requires: ecj
%if ! %{bootstrap}
Requires: osgi(org.eclipse.platform)
@@ -170,8 +167,8 @@ sed -i 's/<tychoBootstrapVersion>0.16.0<\/tychoBootstrapVersion>/<tychoBootstrap
# gid:aid used by bootstrapped build dependencies
mkdir -p .m2/org/ow2/asm/asm-debug-all/4.0/
pushd .m2/org/ow2/asm/asm-debug-all/4.0/
-ln -s %{_mavenpomdir}/JPP.objectweb-asm4-asm-all.pom asm-debug-all-4.0.pom
-ln -s %{_javadir}/objectweb-asm4/asm-all.jar asm-debug-all-4.0.jar
+ln -s %{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom asm-debug-all-4.0.pom
+ln -s %{_javadir}/objectweb-asm/asm-all.jar asm-debug-all-4.0.jar
popd
%patch7 -p1
@@ -203,7 +200,7 @@ if [ "${sysVer}" == "${buildVer}" ]; then
echo "Performing intermediary build"
%patch4 -p1
-mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f -i
%patch4 -p1 -R
@@ -214,7 +211,7 @@ fi
%endif
%build
-mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true clean install javadoc:aggregate
+%mvn_build -f -i -g clean
%install
@@ -308,6 +305,11 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \
%{_javadocdir}/%{name}
%changelog
+* Mon Dec 9 2013 Alexander Kurtakov <akurtako at redhat.com> 0.19.0-5
+- Switch to using %%mvn_build.
+- Update BR/R names.
+- Adapt to asm5.
+
* Thu Nov 21 2013 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-4
- Return expected reactor cache location when XMvn resolution fails.
More information about the scm-commits
mailing list