diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 4532466..b44723e 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -4,8 +4,9 @@ %global debug_package %{nil} %global _enable_debug_packages 0 -# Change this to bcond_without to default to no container support when building for first time in release -%bcond_with container_support +# Change this to 0 to default to no container support when building for +# first time in a release +%global _enable_container_support 1 Epoch: 1 @@ -30,7 +31,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: %{?scl_prefix}eclipse-cdt Version: %{majmin}.%{micro} -Release: 1%{?dist} +Release: 2%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -80,14 +81,14 @@ BuildRequires: %{?scl_prefix}eclipse-swtbot BuildRequires: eclipse-launchbar BuildRequires: nekohtml >= 1.9.21-3 BuildRequires: exec-maven-plugin -%if %{with container_support} +%if %{_enable_container_support} BuildRequires: eclipse-linuxtools-docker %endif Requires: gdb make gcc-c++ autoconf automake libtool Requires: %{?scl_prefix}eclipse-remote Requires: nekohtml >= 1.9.21-3 -%if %{with container_support} +%if %{_enable_container_support} Requires: eclipse-linuxtools-docker %endif Recommends: eclipse-linuxtools-libhover @@ -152,7 +153,7 @@ cp %{SOURCE4} man %patch2 -p1 %patch4 -p1 %patch5 -p1 -%if %{with container_support} +%if %{_enable_container_support} == 0 %patch6 -p1 %endif @@ -195,8 +196,7 @@ popd %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin %pom_remove_plugin org.jacoco:jacoco-maven-plugin -%if %{with container_support} -%else +%if %{_enable_container_support} == 0 %pom_disable_module launch/org.eclipse.cdt.docker.launcher %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature %pom_disable_module launch/org.eclipse.cdt.docker.launcher.source-feature @@ -424,6 +424,9 @@ rm -rf $installDir/eclipse/binary %doc releng/org.eclipse.cdt.releng/notice.html %changelog +* Thu Jun 25 2015 Jeff Johnston 1:8.7.0-2 +- Use simpler macro to control container support and fix macro tests. + * Tue Jun 23 2015 Jeff Johnston 1:8.7.0-1 - Switch to use CDT_8_7 tag. - Add with conditional to remove container support or add it in.