rpms/eclipse/devel eclipse.spec,1.635,1.636

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	eclipse.spec 
Log Message:
Fix version of source bundles.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- eclipse.spec	13 Apr 2009 20:48:45 -0000	1.635
+++ eclipse.spec	14 Apr 2009 12:52:13 -0000	1.636
@@ -10,7 +10,7 @@
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   0
-%define swtver          3.5.0.v3538
+%define swtver          3.5.0.v3539
 %define initialize      1
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.1%{?dist}
+Release:        0.2.2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -398,14 +398,18 @@
 SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
-swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/META-INF/MANIFEST.MF \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x.source_3.5.0.HEAD/build.xml \
                                                       assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
-						      features/org.eclipse.rcp/build.xml
+						      features/org.eclipse.rcp/build.xml \
+						      features/org.eclipse.rcp.source/build.xml
+mv plugins/org.eclipse.swt.gtk.linux.s390.source_{3.5.0.HEAD,%{swtver}}
+mv plugins/org.eclipse.swt.gtk.linux.s390x.source_{3.5.0.HEAD,%{swtver}}
+mv plugins/org.eclipse.swt.gtk.linux.ia64.source_{3.5.0.HEAD,%{swtver}}
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
@@ -1603,6 +1607,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.2
+- Fix version of source bundles.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.1
 - Create org.eclipse.swt.gtk.linux.* based on the ppc version.