rpms/eclipse-emf/devel eclipse-emf.spec,1.7,1.8

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9065

Modified Files:
	eclipse-emf.spec 
Log Message:
* Thu Jun 14 2007 Andrew Overholt <overholt at redhat.com> 2.2.2-2
- Add EPEL5 patches from Rob Myers.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-emf.spec	23 Feb 2007 22:58:23 -0000	1.7
+++ eclipse-emf.spec	14 Jun 2007 14:30:34 -0000	1.8
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -153,7 +153,11 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
+%if 0%{?rhel} == 5
+/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base}
+%else
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+%endif
 SDK=$(cd SDK > /dev/null && pwd)
 
 # We need the platform ISV docs which have been temporarily moved to
@@ -162,7 +166,7 @@
 # have to change this with each release.
 pushd SDK/plugins
 ln -s \
-  %{_libdir}/eclipse/plugins/org.eclipse.platform.doc.isv_3.2.2.R32x_v20070115.jar
+  %{_libdir}/eclipse/plugins/org.eclipse.platform.doc.isv_3.2.*.jar
 popd
 
 # Build the EMF builder helper jars
@@ -525,6 +529,9 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Thu Jun 14 2007 Andrew Overholt <overholt at redhat.com> 2.2.2-2
+- Add EPEL5 patches from Rob Myers.
+
 * Fri Feb 23 2007 Andrew Overholt <overholt at redhat.com> 2.2.2-1
 - 2.2.2
 - Remove unnecessary patch for platform javadoc jar name.