rpms/eclipse-pydev/devel .cvsignore, 1.2, 1.3 eclipse-pydev.spec, 1.1, 1.2 sources, 1.2, 1.3 eclipse-pydev-TestDependent.java.patch, 1.1, NONE fetch-eclipse-pydev.sh, 1.1, NONE

Ben Konrath (bkonrath) fedora-extras-commits at redhat.com
Fri Aug 24 21:06:13 UTC 2007 

Author: bkonrath

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

Modified Files:
	.cvsignore eclipse-pydev.spec sources 
Removed Files:
	eclipse-pydev-TestDependent.java.patch fetch-eclipse-pydev.sh 
Log Message:
* Fri Aug 24 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-1
- 1.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Apr 2007 18:56:32 -0000	1.2
+++ .cvsignore	24 Aug 2007 21:05:40 -0000	1.3
@@ -1 +1 @@
-eclipse-pydev-fetched-src-pydev_1_3_1.tar.bz2
+org.python.pydev.feature-src-1_3_8.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-pydev.spec	27 Apr 2007 18:56:32 -0000	1.1
+++ eclipse-pydev.spec	24 Aug 2007 21:05:40 -0000	1.2
@@ -1,11 +1,6 @@
 Epoch: 1
 
 %define gcj_support         1
-%define version_major       1
-%define version_minor       3
-%define version_majmin      %{version_major}.%{version_minor}
-%define version_micro       1
-%define eclipse_base        %{_datadir}/eclipse
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -16,25 +11,15 @@
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          %{version_majmin}.%{version_micro}
-Release:          5%{?dist}
+Version:          1.3.8
+Release:          1%{?dist}
 License:          Eclipse Public License
 URL:              http://pydev.sourceforge.net/
 Group:            Development/Tools
 
-# The upstream PyDev project does not distribute a source drop conveniently.
-# Instead, you must build it by hand. Generate the source zip using the 
-# enclosed script like so:
-#  ./fetch-eclipse-pydev.sh pydev \
-#    :pserver:anonymous at sourceware.org/cvs/eclipse pydev_1_3_1 \
-#    pydev/org.python.pydev.releng 
-
-Source0:          eclipse-pydev-fetched-src-pydev_%{version_major}_%{version_minor}_%{version_micro}.tar.bz2
-Source1:          fetch-eclipse-pydev.sh
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_8.zip
 # Remove references to the retroweaver jar, since we don't use it
 Patch1:           %{name}-noretroweaver.patch
-# Add a TestDependent class which makes the tests compile
-Patch2:           %{name}-TestDependent.java.patch
 
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
@@ -46,6 +31,7 @@
 %endif
 
 Requires:         eclipse-jdt
+Requires:         eclipse-cvs-client
 Requires:         python
 Requires:         commons-codec >= 1.3
 Requires:         junit >= 3.8.1
@@ -68,28 +54,23 @@
 
 %prep
 %setup -q -c 
-pushd pydev/org.python.pydev.releng/results/
-%patch1 -p0
-%patch2 -p0
 
-# Replace all references to 0.9.7.1 with the correct version number
-for f in `grep -rl '0.9.7.1' *` ; do 
-    if [ -f $f ]; then
-        sed --in-place "s/0.9.7.1/%{version_majmin}.%{version_micro}/g" $f
-    fi
-done 
+# remove pre-generated build files
+find . -name build.xml | xargs rm 
 
-# Remove the unused retroweaver jar
-find . -name retroweaver-rt.jar -exec rm {} \;
+# remove pre-built jars
+rm -f plugins/org.python.pydev.core/core.jar
+rm -f plugins/org.python.pydev.ast/ast.jar
+rm -f plugins/org.python.pydev.debug/pydev-debug.jar
+rm -f plugins/org.python.pydev.parser/parser.jar
+rm -f plugins/org.python.pydev/pydev.jar
+rm -f plugins/org.python.pydev.jython/pydev-jython.jar
+rm -f plugins/org.python.pydev.refactoring/refactoring.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 
+# remove included retroweaver jars as it isn't being used
+find . -name retroweaver-rt.jar | xargs rm 
 
-# Link to system jars
+# link to system jars
 rm -f plugins/org.python.pydev.core/commons-codec.jar
 ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
        plugins/org.python.pydev.core/commons-codec.jar
@@ -102,11 +83,34 @@
 ln -sf %{_datadir}/java/jython.jar \
        plugins/org.python.pydev.jython/jython.jar
 
-popd
+rm -f plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
+# enable when tests are used
+#ln -sf %{_datadir}/java/jflex.jar \
+#       plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
+
+rm -f plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
+# enable when tests are used
+#ln -sf %{_datadir}/java/xpp3-minimal.jar \
+#       plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
+
+rm -f plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
+# enable when tests are used
+#ln -sf %{_datadir}/java/xstream.jar \
+#       plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
+
+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 
+
 
 %build
 # Copy the SDK for build
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -114,8 +118,9 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # build the main pydev feature
-eclipse \
-     -Duser.home=$homedir                              \
+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                     \
@@ -123,29 +128,28 @@
      -DsourceDirectory=$(pwd)                          \
      -DjavacSource=1.5  -DjavacTarget=1.5              \
      -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+     -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}/%{eclipse_base}
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/eclipse
+unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
             build/rpmBuild/org.python.pydev.feature.zip
 
 pushd $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins
-rm -rf \
-  org.python.pydev.core_%{version_majmin}.%{version_micro}/commons-codec.jar
+rm -rf org.python.pydev.core_%{version}/commons-codec.jar
 ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
-  org.python.pydev.core_%{version_majmin}.%{version_micro}/commons-codec.jar
+       org.python.pydev.core_%{version}/commons-codec.jar
 
-mkdir org.python.pydev.core_%{version_majmin}.%{version_micro}/lib
+mkdir org.python.pydev.core_%{version}/lib
 ln -sf %{_datadir}/java/junit.jar \
-  org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
+       org.python.pydev.core_%{version}/lib/junit.jar
 
-rm -rf \
-  org.python.pydev.jython_%{version_majmin}.%{version_micro}/jython.jar
+rm -rf org.python.pydev.jython_%{version}/jython.jar
 ln -sf %{_datadir}/java/jython.jar \
-  org.python.pydev.jython_%{version_majmin}.%{version_micro}/jython.jar
+       org.python.pydev.jython_%{version}/jython.jar
 popd
 
 %if %{gcj_support}
@@ -163,22 +167,25 @@
 
 %files
 %defattr(-,root,root,-)
-%{eclipse_base}/features/org.python.pydev*
-%{eclipse_base}/plugins/org.python.pydev_*
-%{eclipse_base}/plugins/org.python.pydev.ast*
-%{eclipse_base}/plugins/org.python.pydev.core*
-%{eclipse_base}/plugins/org.python.pydev.debug*
-%{eclipse_base}/plugins/org.python.pydev.help*
-%{eclipse_base}/plugins/org.python.pydev.parser*
-%{eclipse_base}/plugins/org.python.pydev.templates*
-%{eclipse_base}/plugins/org.python.pydev.jython*
-%{eclipse_base}/plugins/org.python.pydev.refactoring*
+%{_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*
 
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Aug 24 2007 Ben Konrath <bkonrath at redhat.com> 1:1.3.8-1
+- 1.3.8
+
 * Fri Apr 27 2007 Igor Foox <ifoox at redhat.com> 1:1.3.1-5
 - Add runtime dependancy on the JDT.
 - Reorganize Requires and BuildRequires.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Apr 2007 18:56:32 -0000	1.2
+++ sources	24 Aug 2007 21:05:40 -0000	1.3
@@ -1 +1 @@
-0e4080d2995060abfa345bae0d0259f0  eclipse-pydev-fetched-src-pydev_1_3_1.tar.bz2
+7516703db105d7a248ffcd36581224fb  org.python.pydev.feature-src-1_3_8.zip


--- eclipse-pydev-TestDependent.java.patch DELETED ---


--- fetch-eclipse-pydev.sh DELETED ---

More information about the fedora-extras-commits mailing list