[eclipse-linuxtools] Update to 3.0 final release.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jun 24 13:06:49 UTC 2014


commit 6ed7c5cf3dbf61c80968ac3b4cede8afe313b4cd
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 24 16:03:47 2014 +0300

    Update to 3.0 final release.

 eclipse-linuxtools.spec |   15 ++++++++-------
 sources                 |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 870ac6b..8cd9c82 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -2,17 +2,16 @@
 %{!?scl:%global pkg_name %{name}}
 
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global git_sha e866fae2d8a67985051ef8afba50ed37b4eea105
 
 Name:           %{?scl_prefix}eclipse-linuxtools
 Version:        3.0.0
-Release:        0.3.git20140509%{?dist}
+Release:        1%{?dist}
 Summary:        Linux specific Eclipse plugins
 
 License:        EPL
 URL:            http://eclipse.org/linuxtools/
 #Main directory changed to not be git sha but version as tycho fails with path too long otherwise
-Source0:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{git_sha}.tar.bz2
+Source0:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{version}.tar.bz2
 Patch0:         disable-libhover-lttng.patch
 
 BuildRequires: tycho >= 0.20.0-6
@@ -136,7 +135,7 @@ All test bundles for the Linux Tools project.
 
 
 %prep
-%setup -q -n org.eclipse.linuxtools-%{git_sha}
+%setup -q -n org.eclipse.linuxtools-%{version}
 
 %patch0
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
@@ -149,12 +148,11 @@ sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/cat
 #remove tests that fail to compile
 rm -fr profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java
 rm -fr perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchRemoteTest.java
-sed -i -e "s|, LaunchRemoteTest.class||g" perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/AllPerfTests.java
 
 %build
 %{?scl:%scl_maven_opts}
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-mvn-rpmbuild clean verify -Dmaven.test.skip=true -DskipTychoVersionCheck=true
+xmvn -o clean verify -Dmaven.test.skip=true
 
 pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features
 for f in `ls -1 . | grep jar$`; do
@@ -302,10 +300,13 @@ popd
 %{_javadir}/linuxtools-tests
 
 %changelog
+* Tue Jun 24 2014 Alexander Kurtakov <akurtako at redhat.com> 3.0.0-1
+- Update to 3.0 final release.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-0.3.git20140509
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Tue May 13 2014 Alexander Kurtakov <akurtako at redhat.com> 2:3.0.0-0.2.git20140509
+* Tue May 13 2014 Alexander Kurtakov <akurtako at redhat.com> 3.0.0-0.2.git20140509
 - BR latest tycho to not manually copy eclipse-license.
 
 * Fri May 9 2014 Alexander Kurtakov <akurtako at redhat.com> 3.0.0-0.1.git20140509
diff --git a/sources b/sources
index 883faab..a75ce81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d2ecc68449e35b046e3b85580604a77  org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2
+d3af287d3d3442add6816e60e2ddfe35  org.eclipse.linuxtools-3.0.0.tar.bz2


More information about the scm-commits mailing list