? .build-1.3.14-3.fc10.log ? .build-1.3.18-1.fc10.log ? META-INF ? about.html ? about_files ? clog ? eclipse-pydev-1.3.14 ? eclipse-pydev-1.3.18 ? eclipse-pydev-1.3.18-1.fc10.src.rpm ? noarch ? org.python.pydev.feature-src-1_3_18.zip ? plugin.properties ? test Index: eclipse-pydev.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v retrieving revision 1.10 diff -u -r1.10 eclipse-pydev.spec --- eclipse-pydev.spec 17 Jul 2008 19:05:07 -0000 1.10 +++ eclipse-pydev.spec 30 Jul 2008 21:05:48 -0000 @@ -1,26 +1,24 @@ Epoch: 1 +%define eclipse_base %{_libdir}/eclipse %define gcj_support 1 -# All arches line up except i386 -> x86 -%ifarch %{ix86} -%define eclipse_arch x86 -%else -%define eclipse_arch %{_arch} -%endif - Summary: Eclipse Python development plug-in Name: eclipse-pydev -Version: 1.3.14 -Release: 2%{?dist} +Version: 1.3.18 +Release: 1%{?dist} License: EPL URL: http://pydev.sourceforge.net/ Group: Development/Tools -Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_14.zip +Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_18.zip Source1: org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2 Source2: fetch-pydev-mylyn.sh +# Back-port from HEAD +# http://pydev.cvs.sourceforge.net/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/CopiedWorkbenchLabelProvider.java?revision=1.3&view=markup +Patch0: %{name}-%{version}-compileerrors.patch + %if %{gcj_support} BuildRequires: gcc-java >= 4.1.2 BuildRequires: java-1.5.0-gcj-devel >= 1.5.0 @@ -59,6 +57,7 @@ %prep %setup -q -c +%patch0 tar jxf %{SOURCE1} @@ -108,66 +107,37 @@ rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar %build -# Copy the SDK for build -/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. -mkdir home -homedir=$(cd home > /dev/null && pwd) - -# build the main pydev 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.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 +%{eclipse_base}/buildscripts/pdebuild \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -f org.python.pydev.feature # no xmlrpc3 -> no mylyn on ppc64 due to: # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123 %ifnarch ppc64 -# 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 +%{eclipse_base}/buildscripts/pdebuild \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -d mylyn \ + -f org.python.pydev.mylyn.feature %endif %install rm -rf $RPM_BUILD_ROOT -install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/eclipse +installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/pydev +install -d -m755 $installDir +install -d -m755 ${installDir}-mylyn # pydev main feature -unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ - build/rpmBuild/org.python.pydev.feature.zip +unzip -q -d $installDir build/rpmBuild/org.python.pydev.feature.zip # no xmlrpc3 -> no mylyn on ppc64 due to: # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123 %ifnarch ppc64 # pydev mylyn feature -unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ - build/rpmBuild/org.python.pydev.mylyn.feature.zip +unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zip %endif # deal with linked deps -pushd $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins +pushd $installDir/eclipse/plugins rm -rf org.python.pydev.core_%{version}/commons-codec.jar ln -sf %{_datadir}/java/jakarta-commons-codec.jar \ org.python.pydev.core_%{version}/commons-codec.jar @@ -196,20 +166,11 @@ %files %defattr(-,root,root,-) -%{_datadir}/eclipse/features/org.python.pydev* -%{_datadir}/eclipse/plugins/org.python.pydev_* -%{_datadir}/eclipse/plugins/org.python.pydev.ast* -%{_datadir}/eclipse/plugins/org.python.pydev.core* -%{_datadir}/eclipse/plugins/org.python.pydev.debug* -%{_datadir}/eclipse/plugins/org.python.pydev.help* -%{_datadir}/eclipse/plugins/org.python.pydev.parser* -%{_datadir}/eclipse/plugins/org.python.pydev.templates* -%{_datadir}/eclipse/plugins/org.python.pydev.jython* -%{_datadir}/eclipse/plugins/org.python.pydev.refactoring* +%{eclipse_base}/dropins/pydev # no xmlrpc3 -> no mylyn on ppc64 due to: # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123 %ifnarch ppc64 -%{_datadir}/eclipse/plugins/org.python.pydev.mylyn* +%{eclipse_base}/dropins/pydev-mylyn %endif %if %{gcj_support} @@ -217,6 +178,11 @@ %endif %changelog +* Wed Jul 30 2008 Andrew Overholt 1:1.3.18-1 +- 1.3.18 +- Update for building with Eclipse SDK 3.4 +- Back-port patch from HEAD for building against Eclipse SDK 3.4 + * Thu Jul 17 2008 Tom "spot" Callaway 1:1.3.14-2 - fix license tag