diff --git a/.gitignore b/.gitignore index 94f70a7..0421e55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ -dltk-2.0.0.tar.bz2 -/dltk-2.0.1.tar.bz2 -/dltk-3.0.tar.xz -dltk-3.0.1.tar.xz -/dltk-4.0.0.tar.xz -/eclipse-dltk-5.0.0.tar.xz +/eclipse-dltk-5.*.tar.xz +/eclipse-dltk-5.*/ /.project /noarch /*.src.rpm diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec index 31e4c6d..95aa8c5 100644 --- a/eclipse-dltk.spec +++ b/eclipse-dltk.spec @@ -1,10 +1,9 @@ %global eclipse_dropin %{_datadir}/eclipse/dropins Name: eclipse-dltk -Version: 5.0.0 -Release: 4%{?dist} -Summary: Dynamic Languages Toolkit (DLTK) Eclipse plugin -Group: System Environment/Libraries +Version: 5.1.0 +Release: 0.1.git9eca4e%{?dist} +Summary: Dynamic Languages Toolkit (DLTK) Eclipse plug-in License: EPL URL: http://www.eclipse.org/dltk/ @@ -18,19 +17,16 @@ Patch0: drop_from_p2.patch BuildArch: noarch -BuildRequires: java-devel -BuildRequires: jpackage-utils -BuildRequires: eclipse-pde >= 1:3.5.0 -BuildRequires: eclipse-emf >= 2.5.0 -BuildRequires: eclipse-mylyn >= 3.2 +BuildRequires: eclipse-license >= 1.0.1 +BuildRequires: eclipse-pde >= 1:4.4.0 +BuildRequires: eclipse-emf +BuildRequires: eclipse-mylyn BuildRequires: eclipse-mylyn-ide BuildRequires: eclipse-rse BuildRequires: h2 BuildRequires: maven-local BuildRequires: tycho -Requires: java-headless -Requires: jpackage-utils -Requires: eclipse-platform >= 1:3.5.0 +Requires: eclipse-platform >= 1:4.4.0 Requires: eclipse-emf Requires: h2 @@ -41,8 +37,7 @@ frameworks designed to reduce the complexity of building full featured development environments for dynamic languages such as PHP and Perl. %package ruby -Summary: Ruby Eclipse plugin -Group: Development/Tools +Summary: Ruby Eclipse plug-in Requires: %{name} = %{version}-%{release} %description ruby @@ -50,8 +45,7 @@ Ruby development environment for Eclipse based on the Eclipse Dynamic Languages Toolkit (DLTK). %package tcl -Summary: TCL Eclipse plugin -Group: Development/Tools +Summary: TCL Eclipse plug-in Requires: %{name} = %{version}-%{release} Requires: eclipse-emf >= 2.5.0 @@ -60,36 +54,32 @@ TCL development environment for Eclipse based on the Eclipse Dynamic Languages Toolkit (DLTK). %package itcl -Summary: Incr TCL extension for the TCL Eclipse plugin -Group: Development/Tools +Summary: Incr TCL extension for the TCL Eclipse plug-in Requires: %{name}-tcl = %{version}-%{release} %description itcl -Incr TCL extension for the TCL Eclipse plugin. +Incr TCL extension for the TCL Eclipse plug-in. %package xotcl -Summary: XOTCL extension for the TCL Eclipse plugin -Group: Development/Tools +Summary: XOTCL extension for the TCL Eclipse plug-in Requires: %{name}-tcl = %{version}-%{release} %description xotcl -XOTCL extension for the TCL Eclipse plugin. +XOTCL extension for the TCL Eclipse plug-in. -#%package javascript -#Summary: Javascript Eclipse plugin -#Group: Development/Tools -#Requires: %{name} = %{version}-%{release} +#%%package javascript +#Summary: Javascript Eclipse plug-in +#Requires: %%{name} = %%{version}-%%{release} -#%description javascript +#%%description javascript #Javascript development environment for Eclipse based on the Eclipse #Dynamic Languages Toolkit (DLTK). %package mylyn Summary: Mylyn integration for Eclipse DLTK projects -Group: Development/Tools Requires: %{name} = %{version}-%{release} -Requires: eclipse-mylyn >= 3.2 -Requires: eclipse-mylyn-ide +Requires: eclipse-mylyn +Requires: eclipse-mylyn-ide %description mylyn Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit @@ -97,7 +87,6 @@ Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit %package rse Summary: RSE integration for Eclipse DLTK projects -Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: eclipse-rse @@ -106,15 +95,13 @@ Remote Development Support via RSE for DLTK based IDEs. %package sdk Summary: Eclipse DLTK SDK -Group: System Environment/Libraries -Requires: java-javadoc -Requires: eclipse-pde >= 1:3.5.0 +Requires: eclipse-pde >= 1:4.4.0 Requires: %{name} = %{version}-%{release} Requires: %{name}-ruby = %{version}-%{release} Requires: %{name}-tcl = %{version}-%{release} Requires: %{name}-itcl = %{version}-%{release} Requires: %{name}-xotcl = %{version}-%{release} -#Requires: %{name}-javascript = %{version}-%{release} +#Requires: %%{name}-javascript = %%{version}-%%{release} Requires: %{name}-mylyn = %{version}-%{release} Requires: %{name}-rse = %{version}-%{release} @@ -142,20 +129,12 @@ Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK). %patch0 -sed -i -e "s/org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages/org.eclipse.mylyn.commons.ui.CommonImages/g" org.eclipse.dltk.core/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java +# This should not be necessary in the future +mkdir -p .m2/p2/repo-sdk/features/ +cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/ %build -# Note: Use date from the cvs tag as the context qualifier. -OPTIONS="-DforceContextQualifier=v201201070225 -DskipTychoVersionCheck -Dmaven.test.skip=true clean install" -export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}" -#export JAVA_HOME=%{java_home} -#export PATH=%{java_bin}:/usr/bin:$PATH - -# Ensure that all required dependencies are available in a local p2 repo -# build all features -pushd org.eclipse.dltk.releng/build -mvn-rpmbuild $OPTIONS -popd +xmvn -o clean verify -forg.eclipse.dltk.releng/build/pom.xml %install install -d -m 755 %{buildroot}%{eclipse_dropin} @@ -217,10 +196,9 @@ popd %files xotcl %{eclipse_dropin}/dltk-xotcl -%doc org.eclipse.dltk.tcl/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/* +%doc org.eclipse.dltk.tcl/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/* #%files javascript -#%defattr(-,root,root,-) #%{eclipse_dropin}/dltk-javascript #%doc org.eclipse.dltk.javascript-feature/rootfiles/* @@ -237,6 +215,13 @@ popd %doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core.sdk/rootfiles/* %changelog +* Fri May 09 2014 Mat Booth - 5.1.0-0.1.git9eca4e +- Update to latest upstream for Luna compatibility. +- Add BR on eclipse-license +- Drop unnecessary BR/Rs +- Build with xmvn +- Fix bogus dates + * Fri Mar 28 2014 Michael Simacek - 5.0.0-4 - Use Requires: java-headless rebuild (#1067528) @@ -273,10 +258,10 @@ popd - Install a symlink to h2 in dropins. - Remove blanket symlink of javadir. -* Thu Apr 25 2012 Sami Wagiaalla - 4.0.0-0.3.201201070225cvs +* Wed Apr 25 2012 Sami Wagiaalla - 4.0.0-0.3.201201070225cvs - Install missing bundles. -* Thu Apr 24 2012 Sami Wagiaalla - 4.0.0-0.2.201201070225cvs +* Tue Apr 24 2012 Sami Wagiaalla - 4.0.0-0.2.201201070225cvs - Checkout entire org.eclipse.dltk module. - Patch dltk to build with tycho 0.14.0 - Use tycho to build dltk @@ -318,7 +303,7 @@ popd * Wed Jan 20 2010 Alexander Kurtakov 1.0.0-4 - Main package should require emf. -* Mon Aug 20 2009 Mat Booth 1.0.0-3 +* Thu Aug 20 2009 Mat Booth 1.0.0-3 - Add a SDK package. - Require Mylyn >= 3.2. diff --git a/get-dltk.sh b/get-dltk.sh index ad2a62b..340dc85 100644 --- a/get-dltk.sh +++ b/get-dltk.sh @@ -1,36 +1,37 @@ #!/bin/bash +set -e + NAME="eclipse-dltk" -VERSION=5.0.0 -TAG="Root_R5_0_maintenance" -DATE="" +VERSION=5.1.0 rm -fr $NAME-$VERSION mkdir $NAME-$VERSION pushd $NAME-$VERSION -wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git/snapshot/Root_R5_0_maintenance.tar.bz2 -tar xfs Root_R5_0_maintenance.tar.bz2 -rm -fr Root_R5_0_maintenance.tar.bz2 -mkdir org.eclipse.dltk.releng -mv Root_R5_0_maintenance/* org.eclipse.dltk.releng -rm -fr Root_R5_0_maintenance -wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git/snapshot/Root_R5_0_maintenance.tar.bz2 -tar xfs Root_R5_0_maintenance.tar.bz2 -rm -fr Root_R5_0_maintenance.tar.bz2 -mkdir org.eclipse.dltk.core -mv Root_R5_0_maintenance/* org.eclipse.dltk.core -rm -fr Root_R5_0_maintenance -wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git/snapshot/Root_R5_0_maintenance.tar.bz2 -tar xfs Root_R5_0_maintenance.tar.bz2 -rm -fr Root_R5_0_maintenance.tar.bz2 -mkdir org.eclipse.dltk.ruby -mv Root_R5_0_maintenance/* org.eclipse.dltk.ruby -rm -fr Root_R5_0_maintenance -wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git/snapshot/Root_R5_0_maintenance.tar.bz2 -tar xfs Root_R5_0_maintenance.tar.bz2 -rm -fr Root_R5_0_maintenance.tar.bz2 -mkdir org.eclipse.dltk.tcl -mv Root_R5_0_maintenance/* org.eclipse.dltk.tcl -rm -fr Root_R5_0_maintenance + +TAG=ca20b663d4d7e72b9306e42a6fc31a7ed64da3d5 +wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git/snapshot/org.eclipse.dltk.releng-$TAG.tar.bz2 +tar xfs org.eclipse.dltk.releng-$TAG.tar.bz2 +rm org.eclipse.dltk.releng-$TAG.tar.bz2 +mv org.eclipse.dltk.releng-$TAG org.eclipse.dltk.releng + +TAG=9eca4e7b30b035572ce746109afef4da59183fd2 +wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git/snapshot/org.eclipse.dltk.core-$TAG.tar.bz2 +tar xfs org.eclipse.dltk.core-$TAG.tar.bz2 +rm org.eclipse.dltk.core-$TAG.tar.bz2 +mv org.eclipse.dltk.core-$TAG org.eclipse.dltk.core + +TAG=ef0bce7d8051b4f1f6baa38c7d289332a1da0a4c +wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git/snapshot/org.eclipse.dltk.ruby-$TAG.tar.bz2 +tar xfs org.eclipse.dltk.ruby-$TAG.tar.bz2 +rm org.eclipse.dltk.ruby-$TAG.tar.bz2 +mv org.eclipse.dltk.ruby-$TAG org.eclipse.dltk.ruby + +TAG=e5aec751185681d2d34fb7444bb00c53cc039ef8 +wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git/snapshot/org.eclipse.dltk.tcl-$TAG.tar.bz2 +tar xfs org.eclipse.dltk.tcl-$TAG.tar.bz2 +rm org.eclipse.dltk.tcl-$TAG.tar.bz2 +mv org.eclipse.dltk.tcl-$TAG org.eclipse.dltk.tcl + popd #Remove any commited jars