rpms/eclipse-pydev/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 eclipse-pydev.spec, 1.11, 1.12 sources, 1.8, 1.9 eclipse-pydev-1.3.18-compileerrors.patch, 1.1, NONE

[Michal Nowak]

Author: mnowak

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

Modified Files:
	.cvsignore eclipse-pydev.spec sources 
Added Files:
	import.log 
Removed Files:
	eclipse-pydev-1.3.18-compileerrors.patch 
Log Message:
1.3.20



--- NEW FILE import.log ---
eclipse-pydev-1_3_20-1_fc10:HEAD:eclipse-pydev-1.3.20-1.fc10.src.rpm:1224001997


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Aug 2008 15:12:49 -0000	1.8
+++ .cvsignore	14 Oct 2008 16:35:28 -0000	1.9
@@ -1,5 +1,2 @@
 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-org.python.pydev.feature-src-1_3_9.zip
-org.python.pydev.feature-src-1_3_12.zip
-org.python.pydev.feature-src-1_3_14.zip
-org.python.pydev.feature-src-1_3_18.zip
+org.python.pydev.feature-src-1_3_20.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pydev.spec	7 Aug 2008 15:50:25 -0000	1.11
+++ eclipse-pydev.spec	14 Oct 2008 16:35:29 -0000	1.12
@@ -3,22 +3,21 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define gcj_support         1
 
+%define major     1
+%define minor     3
+%define maint     20
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.3.18
+Version:          %{major}.%{minor}.%{maint}
 Release:          1%{?dist}
 License:          EPL
-URL:              http://pydev.sourceforge.net/
+URL:              http://pydev.sourceforge.net
 Group:            Development/Tools
 
-Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_18.zip
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-%{major}_%{minor}_%{maint}.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
@@ -57,7 +56,6 @@
 
 %prep
 %setup -q -c 
-%patch0
 
 tar jxf %{SOURCE1}
 
@@ -155,6 +153,15 @@
 aot-compile-rpm
 %endif
 
+# rename cgi.py's shebang from /usr/local/bin/python to /usr/bin/env python
+sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{_datadir}/eclipse/dropins/pydev/eclipse/plugins/org.python.pydev.jython_1.3.20/Lib/cgi.py
+# convert .py$ files from mode 0644 to mode 0755
+chmod 0755 `find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs`
+
+# convert '\r\n' end-of-lines to *unix-like '\n'
+# sed -i 's/\r//' `find ${RPM_BUILD_ROOT} -name '*\.py' | xargs`
+
+
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -178,6 +185,14 @@
 %endif
 
 %changelog
+* Tue Oct 14 2008 Michal Nowak <mnowak at redhat.com> 1:1.3.20-1
+- bump to 1.3.20
+- created general versioning scheme for version tag & tarball URI)
+- sed: /usr/local/bin/python -> /usr/bin/env python in Jython's cgi.py
+- convert .py$ files from mode 0644 to mode 0755
+- possibility to convert '\r\n' end-of-lines to *nix-like '\n'
+  in all '.py$' files
+
 * Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1:1.3.18-1
 - 1.3.18
 - Update for building with Eclipse SDK 3.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Aug 2008 15:12:49 -0000	1.8
+++ sources	14 Oct 2008 16:35:29 -0000	1.9
@@ -1,3 +1,2 @@
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-9c21347399754dc4696e79e73359ef01  org.python.pydev.feature-src-1_3_14.zip
-72deddaf00941649ce43a8c896abd3bf  org.python.pydev.feature-src-1_3_18.zip
+9f9432cc41a797b27aa93755233336a3  org.python.pydev.feature-src-1_3_20.zip


--- eclipse-pydev-1.3.18-compileerrors.patch DELETED ---