akurtakov pushed to eclipse-cdt (master). "Disable jacoco plugin and remove useless directory from the build."

Thu Jun 4 09:13:25 UTC 2015

From d10d585f64c518a0ae431a5933c090d1ba022843 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu, 4 Jun 2015 12:13:15 +0300
Subject: Disable jacoco plugin and remove useless directory from the build.

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9c3106b..273b19a 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -27,7 +27,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.4.git6c36f7f%{?dist}
+Release:        0.5.git6c36f7f%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 Requires:       eclipse-platform
@@ -77,7 +77,6 @@ BuildRequires: %{?scl_prefix}eclipse-swtbot
 BuildRequires: eclipse-launchbar
 BuildRequires: nekohtml >= 1.9.21-3
 BuildRequires: exec-maven-plugin
-BuildRequires: jacoco-maven-plugin
 
 Requires:      gdb make gcc-c++ autoconf automake libtool
 Requires:      %{?scl_prefix}eclipse-platform >= 1:4.3.0
@@ -133,7 +132,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 Source for Eclipse CDT for use within Eclipse.
 
 %prep
-%setup -q -c
+%setup -q -n %{cdt_snapshot}
 
 # get desktop info
 mkdir desktop
@@ -143,7 +142,6 @@ cp %{SOURCE3} desktop
 mkdir man
 cp %{SOURCE4} man
 
-pushd %{cdt_snapshot}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -186,6 +184,7 @@ popd
 
 # Disable the jgit provider and force default packaging
 %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin
+%pom_remove_plugin org.jacoco:jacoco-maven-plugin
 
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
@@ -193,8 +192,6 @@ popd
 
 sed -i -e "s|org.junit|org.hamcrest.core, org.junit|g" dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
 
-popd
-
 %build
 export JAVA_HOME=%{java_home}
 
@@ -203,7 +200,6 @@ export JAVA_HOME=%{java_home}
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
 %endif
 
-pushd %{cdt_snapshot}
 pushd core/org.eclipse.cdt.core.linux/library
 make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
@@ -212,8 +208,6 @@ popd
 xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
 %{?scl:EOF}
 
-popd
-
 %install
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
@@ -234,12 +228,11 @@ install -d -m755 $binInstallDir
 install -d -m755 $manInstallDir
 
 # Unzip contents of the cdt repo, removing all but plugins and features
-unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
+unzip -q -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
 -d $installDir/eclipse
 
 #tests
 # We need grep to return non-zero status to skip all non eclipse-test-plugins
-pushd %{cdt_snapshot}
 set +e
 for pom in `find . -name pom.xml`; do
  grep -q '<packaging>eclipse-test-plugin</packaging>' ${pom}
@@ -249,7 +242,6 @@ for pom in `find . -name pom.xml`; do
  fi
 done
 set -e
-popd
 
 # Unzip CDT Standalone Debug plugin which contains installation scripts for the end-user to use
 pushd ${installDir}/eclipse/plugins
@@ -380,35 +372,38 @@ rm -rf $installDir/eclipse/binary
 %{_bindir}/cdtdebug
 %{_datadir}/applications/*
 %{_mandir}/man1/cdtdebug.1*
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %files sdk
 %{eclipse_base}/dropins/cdt-sdk
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %files parsers
 %{eclipse_base}/dropins/cdt-parsers
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %files tests
 %{_javadir}/eclipse-cdt-tests
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %files llvm
 %{eclipse_base}/dropins/cdt-llvm
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %files arduino
 %{eclipse_base}/dropins/cdt-arduino
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
-%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu Jun 4 2015 Alexander Kurtakov <akurtako at redhat.com> 1:8.7.0-0.5.git6c36f7f
+- Disable jacoco plugin and remove useless directory from the build.
+
 * Thu Jun 4 2015 Alexander Kurtakov <akurtako at redhat.com> 1:8.7.0-0.4.git6c36f7f
 - Add arduino subpackage and enable building arduino plugins.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-cdt.git/commit/?h=master&id=d10d585f64c518a0ae431a5933c090d1ba022843
