rpms/eclipse-pydev/devel eclipse-pydev.spec,1.3,1.4

[Ben Konrath (bkonrath)]

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20594

Modified Files:
	eclipse-pydev.spec 
Log Message:
* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-2
- Add pydev mylyn feature.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-pydev.spec	24 Aug 2007 21:09:06 -0000	1.3
+++ eclipse-pydev.spec	28 Aug 2007 22:46:17 -0000	1.4
@@ -12,12 +12,14 @@
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          1.3.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          Eclipse Public License
 URL:              http://pydev.sourceforge.net/
 Group:            Development/Tools
 
 Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_8.zip
+Source1:          org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
+Source2:          fetch-pydev-mylyn.sh
 
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
@@ -29,12 +31,13 @@
 %endif
 
 Requires:         eclipse-jdt
-Requires:         eclipse-cvs-client
 Requires:         python
 Requires:         commons-codec >= 1.3
 Requires:         junit >= 3.8.1
 Requires:         jython >= 2.2
 BuildRequires:    eclipse-pde
+BuildRequires:    eclipse-mylyn
+BuildRequires:    eclipse-mylyn-ide
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    junit >= 3.8.1
 BuildRequires:    commons-codec >= 1.3
@@ -53,6 +56,8 @@
 %prep
 %setup -q -c 
 
+tar jxf %{SOURCE1}
+
 # remove pre-generated build files
 find . -name build.xml | xargs rm 
 
@@ -99,16 +104,16 @@
 rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
 
 # Remove #!'s from the .py files enclosed in org.python.pydev.jython
-for f in `find plugins -name '*.py'` ; do 
-    if [ -f $f ]; then
-        sed --in-place "s/^#!.*$//" $f
-    fi
-done 
+#for f in `find plugins -name '*.py'` ; do 
+#    if [ -f $f ]; then
+#        sed --in-place "s/^#!.*$//" $f
+#    fi
+#done 
 
 
 %build
 # Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
+/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse mylyn
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -130,12 +135,34 @@
      -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
      -vmargs -Duser.home=$homedir
 
+# build the pydev mylyn feature
+java -cp $SDK/startup.jar                              \
+     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
+     org.eclipse.core.launcher.Main                    \
+     -application org.eclipse.ant.core.antRunner       \
+     -Dtype=feature                                    \
+     -Did=org.python.pydev.mylyn.feature               \
+     -DbaseLocation=$SDK                               \
+     -DsourceDirectory=$(pwd)                          \
+     -DjavacSource=1.5  -DjavacTarget=1.5              \
+     -DbuildDirectory=$(pwd)/build                     \
+     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
+     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
+     -vmargs -Duser.home=$homedir
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/eclipse
+
+# pydev main feature
 unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
             build/rpmBuild/org.python.pydev.feature.zip
 
+# pydev mylyn feature
+unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
+            build/rpmBuild/org.python.pydev.mylyn.feature.zip
+
+# deal with linked deps
 pushd $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins
 rm -rf org.python.pydev.core_%{version}/commons-codec.jar
 ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
@@ -175,12 +202,16 @@
 %{_datadir}/eclipse/plugins/org.python.pydev.templates*
 %{_datadir}/eclipse/plugins/org.python.pydev.jython*
 %{_datadir}/eclipse/plugins/org.python.pydev.refactoring*
+%{_datadir}/eclipse/plugins/org.python.pydev.mylyn*
 
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-2
+- Add pydev mylyn feature.
+
 * Fri Aug 24 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-1
 - 1.3.8