From 401372369e3ffdc0047b6217c4bb95aada370610 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jan 11 2005 17:05:36 +0000
Subject: - fix versioning and release to upgrade cleanly


---

diff --git a/eclipse.spec b/eclipse.spec
index 24f94dd..fe5084a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -14,6 +14,8 @@ ExclusiveArch:		i386
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_oldmajmin  3.0
 %define eclipse_micro   0
+%define eclipse_milestone   M4
+%define full_version    %{eclipse_major}.%{eclipse_minor}%{eclipse_milestone}
 %define libname         libswt3
 %define selfbuild	1
 
@@ -52,8 +54,8 @@ ExclusiveArch:		i386
 
 Summary:        %{pkg_summary}
 Name:           eclipse
-Version:        %{eclipse_majmin}.M4
-Release:        11
+Version:        %{eclipse_majmin}
+Release:        0.%{eclipse_milestone}.1
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -505,8 +507,10 @@ done
 popd
 
 pushd $RPM_BUILD_ROOT%{_jnidir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
+ln -sf
+%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar %swt-gtk-%{full_version}.jar
+ln -sf
+%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar %swt-pi-gtk-%{full_version}.jar
 popd
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
@@ -683,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 
 %changelog
+* Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.1
+- fix versioning and release to upgrade cleanly
+
 * Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1.M4-9
 - add Provides: ecj for eclipse-ecj