From d4a32bda03eccf2c5914083063565ec07bc93466 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: May 21 2016 16:34:26 +0000 Subject: Add a patch to fix LLVM documentation, ebz#459567 - Drop unneeded BR on RSE --- diff --git a/eclipse-cdt-bug-459567.patch b/eclipse-cdt-bug-459567.patch new file mode 100644 index 0000000..68300e6 --- /dev/null +++ b/eclipse-cdt-bug-459567.patch @@ -0,0 +1,29 @@ +From a0885f57d9a82883b4490a896500c09be6db7752 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Sat, 21 May 2016 16:40:50 +0100 +Subject: [PATCH] Bug 459567 - Help missing for LLVM Managed Build + +Include 'help' directory in build.properties + +Change-Id: I6c86a5325a323c67a50166b70372c8a918aa8553 +Signed-off-by: Mat Booth +--- + llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties +index f47d322..ac0ebbc 100755 +--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties ++++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties +@@ -8,6 +8,7 @@ bin.includes = plugin.xml,\ + about.ini,\ + about.mappings,\ + about.properties,\ +- cdt_logo_icon32.png ++ cdt_logo_icon32.png,\ ++ help/ + src.includes = patches/,\ + help/,\ +-- +2.5.5 + diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 4e06618..a21b609 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -37,7 +37,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 0.5.gitdff6b3b%{?dist} +Release: 0.6.gitdff6b3b%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -69,6 +69,9 @@ Patch4: remove-docker.patch # Following removes autotools and remote plugins from repo Patch5: remove-remote.patch +# Fix LLVM documentation +Patch6: eclipse-cdt-bug-459567.patch + BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: eclipse-license @@ -85,7 +88,6 @@ BuildRequires: mockito %if %{_enable_container_and_remote_support} BuildRequires: eclipse-linuxtools-docker BuildRequires: eclipse-remote >= 2.0.0-1 -BuildRequires: eclipse-rse %endif Requires: gdb make gcc-c++ @@ -183,6 +185,7 @@ cp %{SOURCE4} man %patch4 -p0 %patch5 -p0 %endif +%patch6 -p1 TYCHO_ENV="linuxgtk%{eclipse_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" @@ -424,6 +427,10 @@ cp man/cdtdebug.man $manInstallDir/cdtdebug.1 %endif %changelog +* Sat May 21 2016 Mat Booth - 1:9.0.0-0.6.gitdff6b3b +- Add a patch to fix LLVM documentation, ebz#459567 +- Drop unneeded BR on RSE + * Thu May 12 2016 Alexander Kurtakov 1:9.0.0-0.5.gitdff6b3b - Fix natives compile for profiles not included upstream.