rpms/eclipse/devel eclipse.spec,1.478,1.479

[Ben Konrath (bkonrath)]

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366

Modified Files:
	eclipse.spec 
Log Message:
* Mon Sep 04 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-14
- Add Fedora Eclipse product plugin.
- Add Requires: eclipse-rpm-editor to platform subpackage.



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- eclipse.spec	1 Sep 2007 02:57:59 -0000	1.478
+++ eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
@@ -23,15 +23,14 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        13%{?dist} 
+Release:        14%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
-Source1:        %{name}-fedora-splash-3.3.0.png
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-#Source4:        fedora-eclipse-product-plugin-3.3.0.1.zip
+Source4:        org.fedoraproject.ide.platform-3.3.0.1.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:       ecj.sh.in
@@ -223,6 +222,7 @@
 Requires: eclipse-cvs-client
 Requires: eclipse-subclipse
 Requires: eclipse-changelog
+Requires: eclipse-rpm-editor
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64 alpha
@@ -233,7 +233,7 @@
 %endif
 
 %description    platform
-The Eclipse Platform is the base of all IDE plugins.  This does not include the
+The Fedora Eclipse Platform is the base of all IDE plugins.  This does not include the
 Java Development Tools or the Plugin Development Environment.
 
 %package        jdt
@@ -384,9 +384,6 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties
 popd
 
-# Splashscreen
-cp %{SOURCE1} plugins/org.eclipse.platform/splash.bmp
-
 # FIXME this should be patched upstream with a flag to turn on and off 
 # all output should be directed to stdout
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
@@ -629,7 +626,6 @@
 fi
 
 tar jxf %{SOURCE20}
-#unzip -qq %{SOURCE4}
 
 %build
 ORIGCLASSPATH=$CLASSPATH
@@ -688,8 +684,7 @@
 SDK=$(cd eclipse && pwd)
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//')
 pushd equinox-incubator
-mkdir -p build
-mkdir -p home
+mkdir -p build home
 homedir=$(cd home && pwd)
 
 # This can go away when package build handles plugins (not just features)
@@ -745,11 +740,13 @@
 ln -s plugins/$LAUNCHERNAME startup.jar
 popd
 
-## The FileInitializer app isn't part of the SDK (yet?) but we want it to be
-## around for other RPMs
+# Install the file initializer app
 cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
+# Install the Fedora Eclipse product plugin
+unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins %{SOURCE4}
+
 # Set up an extension location and a link file for the arch-specific dir
 echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link
 echo "name=Eclipse Platform" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension
@@ -824,8 +821,10 @@
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app
 
-# Set eclipse.product to be org.eclipse.platform.ide 
-sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
+# Set eclipse.product to org.fedoraproject.ide.platform 
+sed --in-place "s/plugins\/org.eclipse.platform/plugins\/org.fedoraproject.ide.platform/" \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
+sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the launcher so
@@ -886,19 +885,17 @@
 popd
 
 # Icons
-PLATFORMSUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//")
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse48.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse32.png \
+ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s ../../../../%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse.png \
+ln -s ../../../../%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %ifarch %{ix86} x86_64
 # Remove unused icon.xpm
 # see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
@@ -1360,6 +1357,7 @@
 %{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
+%{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform
 %ifarch %{ix86} x86_64 ppc
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
 %endif
@@ -1571,6 +1569,10 @@
 %endif
 
 %changelog
+* Mon Sep 04 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-14
+- Add Fedora Eclipse product plugin.
+- Add Requires: eclipse-rpm-editor to platform subpackage.
+
 * Thu Aug 30 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-13
 - Move *-sdk subpackages to pde subpackage.
 - Add BuildRequires: libXt-devel for IcedTea build.