Conflict with existing emf.

eclipse.spec

@@ -98,8 +98,11 @@ Requires:       webkitgtk
 SWT Library for GTK+-2.0.
 
 %package -n     eclipse-emf-core
+Version:        2.8
 Summary:        Eclipse Modeling Framework Core
 Group:          Development/Languages
+Conflicts:      eclipse-emf < 2.8.0
+
 %description    emf-core
 Eclipse Modeling Framework Core
 
@@ -185,7 +188,7 @@ export JAVA_HOME=%{java_home}
 %setup -q -n eclipse-build-%{eb_sha1}
 cp %{SOURCE1} .
 ant applyPatches
-pushd build/eclipse-%{version}-%{build_id}-src
+pushd build/eclipse-%{eclipse_majmin}.%{eclipse_micro}-%{build_id}-src
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -365,7 +368,7 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/swt.jar
 %{_libdir}/java/swt.jar
 
-%files emf-core
+%files -n  eclipse-emf-core
 %{_libdir}/%{name}/features/org.eclipse.emf.common_*
 %{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
 %{_libdir}/%{name}/plugins/org.eclipse.emf.common_*