rpms/eclipse-dltk/devel eclipse-dltk.spec,1.6,1.7

[mbooth]

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-dltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28365/eclipse-dltk/devel

Modified Files:
	eclipse-dltk.spec 
Log Message:
* Mon Aug 20 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-3
- Add a SDK package.
- Require Mylyn >= 3.2.


Index: eclipse-dltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dltk/devel/eclipse-dltk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-dltk.spec	10 Aug 2009 05:56:45 -0000	1.6
+++ eclipse-dltk.spec	22 Aug 2009 22:45:39 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dltk
 Version:   1.0.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -23,7 +23,7 @@ BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.5.0
 BuildRequires:    eclipse-emf >= 2.5.0
-BuildRequires:    eclipse-mylyn
+BuildRequires:    eclipse-mylyn >= 3.2
 BuildRequires:    eclipse-rse
 Requires:         java
 Requires:         jpackage-utils
@@ -74,7 +74,7 @@ XOTCL extension for the TCL Eclipse plug
 Summary:   Mylyn integration for Eclipse DLTK projects
 Group:     Development/Tools
 Requires:  %{name} = %{version}-%{release}
-Requires:  eclipse-mylyn
+Requires:  eclipse-mylyn >= 3.2
 
 %description mylyn
 Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
@@ -89,6 +89,22 @@ Requires:  eclipse-rse
 %description rse
 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:  %{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}-mylyn = %{version}-%{release}
+Requires:  %{name}-rse   = %{version}-%{release}
+
+%description sdk
+Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
+
 # TODO: Python IDE, Javascript IDE
 
 %prep
@@ -107,32 +123,54 @@ if [ ! -z "$JARS" ]; then
 fi
 
 %build
+# Note: Use date from the cvs tag as the context qualifier.
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20090617"
+
 # build all features
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "emf"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn \
-  -d "emf mylyn" 
+  -a "$OPTIONS" -d "mylyn"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.rse \
-  -d "rse"
+  -a "$OPTIONS" -d "rse"
+
+# build all sdk features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.core.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.ruby.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.tcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.itcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.xotcl.sdk \
+  -a "$OPTIONS" -d "emf"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.mylyn.sdk \
+  -a "$OPTIONS" -d "mylyn"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.dltk.rse.sdk \
+  -a "$OPTIONS" -d "rse"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-core  build/rpmBuild/org.eclipse.dltk.core.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-ruby  build/rpmBuild/org.eclipse.dltk.ruby.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-tcl   build/rpmBuild/org.eclipse.dltk.tcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-itcl  build/rpmBuild/org.eclipse.dltk.itcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-xotcl build/rpmBuild/org.eclipse.dltk.xotcl.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-mylyn build/rpmBuild/org.eclipse.dltk.mylyn.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dltk-rse   build/rpmBuild/org.eclipse.dltk.rse.zip
+
+SUBPACKAGES="core ruby tcl itcl xotcl mylyn rse"
+for s in $SUBPACKAGES ; do
+  unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-$s  build/rpmBuild/org.eclipse.dltk.$s.zip
+  unzip -q -n -d %{buildroot}%{eclipse_dropin}/dltk-sdk build/rpmBuild/org.eclipse.dltk.$s.sdk.zip
+
+  # the non-sdk builds are a subset of the sdk builds, so delete duplicate features & plugins from the sdks
+  (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/features | xargs rm -rf)
+  (cd %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins && ls %{buildroot}%{eclipse_dropin}/dltk-$s/eclipse/plugins | xargs rm -rf)
+done
 
 %clean
 rm -rf %{buildroot}
@@ -172,7 +210,16 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/dltk-rse
 %doc org.eclipse.dltk.rse-feature/rootfiles/*
 
+%files sdk
+%defattr(-,root,root,-)
+%{eclipse_dropin}/dltk-sdk
+%doc org.eclipse.dltk.core.sdk/rootfiles/*
+
 %changelog
+* Mon Aug 20 2009 Mat Booth <fedora at matbooth.co.uk> 1.0.0-3
+- Add a SDK package.
+- Require Mylyn >= 3.2.
+
 * Mon Aug 10 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-2
 - Add RSE plugin.