[eclipse-cdt] Remove unneeded cleanups.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Apr 18 11:46:26 UTC 2012
commit 152d59bea85f8ba705d89105f8a892acb29ff19f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Apr 18 12:10:27 2012 +0300
Remove unneeded cleanups.
- Organize patches.
- Use the official libhover tarball.
- Build using pdebuild script.
eclipse-cdt-libhover-libstdcxx.patch | 4 +-
eclipse-cdt.spec | 78 ++++++++++++----------------------
sources | 2 +-
3 files changed, 30 insertions(+), 54 deletions(-)
---
diff --git a/eclipse-cdt-libhover-libstdcxx.patch b/eclipse-cdt-libhover-libstdcxx.patch
index 8464c41..8526938 100644
--- a/eclipse-cdt-libhover-libstdcxx.patch
+++ b/eclipse-cdt-libhover-libstdcxx.patch
@@ -1,6 +1,6 @@
diff -up ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
---- ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix 2011-04-12 18:02:28.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml 2011-04-12 18:02:50.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover.feature/feature.xml.fix 2011-04-12 18:02:28.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover.feature/feature.xml 2011-04-12 18:02:50.000000000 -0400
@@ -50,4 +50,11 @@
version="0.0.0"
unpack="false"/>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 24bbce7..5d47549 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -21,7 +21,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 0.1.junom6%{?dist}
+Release: 0.2.junom6%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -32,7 +32,7 @@ Requires: eclipse-platform
# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b
Source0: %{cdt_snapshot}.tar.gz
-Source2: %{name}-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz
+Source2: http://download.eclipse.org/technology/linuxtools/0.10.0-sources/linuxtools-libhover-parent-0.10.0-src.tar.bz2
Source15: make-libhover-tarball.sh
# Script to run the tests in Xvnc
@@ -50,33 +50,33 @@ Source12: ammacros-1.9.5.xml
Source13: ammacros-1.9.6.xml
# Patch so can build with tycho
-Patch10: %{name}-tycho-build.patch
+Patch0: %{name}-tycho-build.patch
# Patch to remove shared license references
-Patch11: %{name}-remove-shared-license.patch
+Patch1: %{name}-remove-shared-license.patch
# Patch to generate p2.source plugin
-Patch12: %{name}-p2-source.patch
+Patch2: %{name}-p2-source.patch
# Add XML -> HTML generation after running tests
-Patch13: %{name}-testaggregation.patch
+Patch3: %{name}-testaggregation.patch
# Following are patches to build libhover libstdcxx plug-in and to supply
# binary libhover data directly in the plug-in itself.
-Patch14: %{name}-libhover-local-libstdcxx.patch
-Patch15: %{name}-libhover-libstdcxx.patch
+Patch4: %{name}-libhover-local-libstdcxx.patch
+Patch5: %{name}-libhover-libstdcxx.patch
# Add LDFLAGS to Makefile for .so
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
-Patch16: %{name}-ppc64-add_ldflags.patch
+Patch6: %{name}-ppc64-add_ldflags.patch
# Add define of _XOPEN_SOURCE so that ptsname header is included
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
-Patch17: %{name}-ppc64-add_xopen_source-include.patch
+Patch7: %{name}-ppc64-add_xopen_source-include.patch
# Following is a patch to autotools to supply macro hover docs locally
# in the plugin.
-Patch19: %{name}-autotools-local.patch
+Patch8: %{name}-autotools-local.patch
BuildRequires: tycho
BuildRequires: tycho-extras
@@ -97,7 +97,6 @@ ExclusiveArch: %{ix86} x86_64
%else
ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Eclipse features and plugins that are useful for C and C++ development.
@@ -123,19 +122,18 @@ Source for Eclipse CDT for use within Eclipse.
%setup -q -c
pushd %{cdt_snapshot}
-%patch10 -p1
+%patch0 -p1
sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
popd
## Libhover stuff
-mkdir libhover
-pushd libhover
-tar -xzf %{SOURCE2}
+tar -xaf %{SOURCE2}
+pushd linuxtools-libhover-parent-0.10.0-src
# newlib libhover is an optional feature...remove it from CDT base
rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
-%patch14 -p0
-%patch15 -p0
+%patch4 -p0
+%patch5 -p0
pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
mkdir data
pushd data
@@ -153,8 +151,8 @@ cd org.eclipse.cdt.core.linux.%{eclipse_arch}
sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
mv os/linux/{x86,%{eclipse_arch}}
cd ../org.eclipse.cdt.core.linux
-%patch16 -p0
-%patch17 -p0
+%patch6 -p0
+%patch7 -p0
popd
%endif
@@ -194,16 +192,6 @@ pushd core/org.eclipse.cdt.core.linux/library
make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
popd
-PDEBUILDVERSION=$(ls %{eclipse_base}/dropins/sdk/plugins \
- | grep org.eclipse.pde.build_ | \
- sed 's/org.eclipse.pde.build_//')
-PDEDIR=%{eclipse_base}/dropins/sdk/plugins/org.eclipse.pde.build_$PDEBUILDVERSION
-
-
-LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
- | grep org.eclipse.equinox.launcher_)
-LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
-
mvn-rpmbuild -o -fae clean install
## Libhover has dependencies on CDT so we must add these to the SDK directory
@@ -211,23 +199,11 @@ unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
popd
## Libhover build
-pushd libhover
-java -jar $LAUNCHER \
- -Duser.home=$homedir \
- org.eclipse.equinox.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -Dtype=feature \
- -Did=org.eclipse.linuxtools.cdt.libhover.feature \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=$PDEDIR/templates/package-build \
- -f $PDEDIR/scripts/build.xml main
+pushd linuxtools-libhover-parent-0.10.0-src
+eclipse-pdebuild -f org.eclipse.linuxtools.cdt.libhover.feature -a "-DbaseLocation=$SDK"
popd
%install
-rm -rf ${RPM_BUILD_ROOT}
-
# Eclipse may try to write to the home directory.
mkdir -p home
homedir=$(cd home > /dev/null && pwd)
@@ -252,7 +228,7 @@ for x in $installDir/eclipse/features/*.jar; do
done
# Libhover install
-pushd libhover
+pushd linuxtools-libhover-parent-0.10.0-src
unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
popd
@@ -347,22 +323,22 @@ org.eclipse.equinox.p2.publisher.EclipseGenerator \
rm -rf repo
popd
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%files
-%defattr(-,root,root)
%{eclipse_base}/dropins/cdt
%files sdk
-%defattr(-,root,root)
%{eclipse_base}/dropins/cdt-sdk
%files parsers
-%defattr(-,root,root)
%{eclipse_base}/dropins/cdt-parsers
%changelog
+* Wed Apr 18 2012 Alexander Kurtakov <akurtako at redhat.com> 1:8.1.0-0.2.junom6
+- Remove unneeded cleanups.
+- Organize patches.
+- Use the official libhover tarball.
+- Build using pdebuild script.
+
* Tue Apr 17 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.1.junom6
- Update CDT to Juno M6 (8.1.0 pre-release).
- Switch to use tycho to build CDT.
diff --git a/sources b/sources
index 48054c8..263868f 100644
--- a/sources
+++ b/sources
@@ -8,5 +8,5 @@
4404043432f7f30300139ce39288ba93 ammacros-1.4-p6.xml
f6edf5299e6f0d89017bd295a296c2cd ammacros-1.9.5.xml
f5c671311f49cdb33eaaa64ab6d781fa ammacros-1.9.6.xml
-e8d4bd3270feb76350d6f7cdb0ebb264 eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz
36fb8a9ec20d9ae58a254dad50b9c2e5 org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz
+65b0a1afed298eb4471996979216b5eb linuxtools-libhover-parent-0.10.0-src.tar.bz2
More information about the scm-commits
mailing list