rpms/eclipse/devel eclipse.spec,1.408,1.409

[fedora-cvs-commits at redhat.com]

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32169

Modified Files:
	eclipse.spec 
Log Message:
* Wed Feb 07 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-37
- Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- eclipse.spec	7 Feb 2007 00:29:16 -0000	1.408
+++ eclipse.spec	7 Feb 2007 20:27:41 -0000	1.409
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        36%{?dist} 
+Release:        37%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -972,6 +972,11 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
+# Adding support for ppc64, s390{x} and sparc{64} makes the rcp feature 
+# have multilib conflicts
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/features
+
 # To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is
 # installed, we must check for its presence at %%post{,un} time.  This does not
 # work in the biarch case, though, if it is not in an arch-specific location.
@@ -1476,7 +1481,7 @@
 %{_datadir}/%{name}/about_files
 %endif
 %{_datadir}/%{name}/readme
-%{_datadir}/%{name}/features/org.eclipse.rcp_*
+%{_libdir}/%{name}/features/org.eclipse.rcp_*
 %{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
 %{_datadir}/%{name}/plugins/org.eclipse.osgi_*
 %{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
@@ -1742,6 +1747,9 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Wed Feb 07 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-37
+- Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}.
+
 * Tue Feb 06 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-36
 - Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib 
   problem.