From 2d49d8ca87bfcd2949888aa906876a2860c353c2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: May 20 2009 19:43:48 +0000 Subject: - Remove Fedora branding. --- diff --git a/.cvsignore b/.cvsignore index bdb840c..72828e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,14 +1,10 @@ ecf-filetransfer-v20080611-1715.tar.bz2 eclipse-ecj-gcj.tar.bz2 eclipse-fileinitializerapp.tar.bz2 -org.fedoraproject.ide.feature-1.0.0.zip eclipse-sourceBuild-srcIncluded-3.4.1.zip eclipse-3.4.1-testframework.tar.bz2 -org.fedoraproject.ide.platform-3.4.1.zip pre320changelog.txt eclipse-sourceBuild-srcIncluded-3.4.2.zip eclipse-3.4.2-testframework.tar.bz2 -org.fedoraproject.ide.platform-3.4.2.zip eclipse-sourceBuild-srcIncluded-I20090401-1325.zip eclipse-sourceBuild-srcIncluded-I20090416-1053.zip -org.fedoraproject.ide.platform-3.5.0.zip diff --git a/eclipse.spec b/eclipse.spec index 36574c6..841b89d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -29,25 +29,13 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.2.7%{?dist} +Release: 0.2.8%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip Source2: %{name}.desktop #Source3: eclipse.in -# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ -# -r fedoraeclipse-3_4_2 branding/org.fedoraproject.ide.platform -# cd branding -# zip -r org.fedoraproject.ide.platform-3.4.2.zip \ -# org.fedoraproject.ide.platform -Source4: org.fedoraproject.ide.platform-%{version}.zip -# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ -# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature -# cd branding -# zip -r org.fedoraproject.ide.feature-1.0.0.zip \ -# org.fedoraproject.ide-feature -Source5: org.fedoraproject.ide.feature-1.0.0.zip Source16: %{name}-copy-platform.sh Source17: efj.sh.in # This file contains the types of files we'd like to extract from the jars @@ -266,7 +254,7 @@ Provides: eclipse-cvs-client = 1:%{version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 %description platform -The Fedora Eclipse Platform is the base of all IDE plugins. This does not include the +The Eclipse Platform is the base of all IDE plugins. This does not include the Java Development Tools or the Plugin Development Environment. %package jdt @@ -863,11 +851,6 @@ LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclip cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ $sdkDir/plugins -# Install the Fedora Eclipse product plugin -unzip -qq -d $sdkDir/plugins %{SOURCE4} -# Install the Fedora Eclipse product feature -unzip -qq -d $sdkDir/features %{SOURCE5} - installDir=$sdkDir-Platform metadataDir=$installDir/metadata-Platform provisionDir=$installDir-provisioned @@ -889,13 +872,13 @@ org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -metadataRepository file:$metadataDir \ -artifactRepository file:$metadataDir \ -source $installDir \ --root "Fedora Eclipse Platform" \ +-root "Eclipse Platform" \ -rootVersion %{version} \ -flavor tooling \ -publishArtifacts \ -append \ --artifactRepositoryName "Fedora Eclipse" \ --metadataRepositoryName "Fedora Eclipse" +-artifactRepositoryName "Eclipse Platform" \ +-metadataRepositoryName "Eclipse Platform" # JDT jdtDir=$sdkDir-JDT @@ -937,12 +920,12 @@ org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -metadataRepository file:$jdtMetadata \ -artifactRepository file:$jdtMetadata \ -source $jdtDir \ --root "Fedora Eclipse JDT" \ +-root "Eclipse JDT" \ -rootVersion %{version} \ -flavor tooling \ -append \ --artifactRepositoryName "Fedora Eclipse JDT" \ --metadataRepositoryName "Fedora Eclipse JDT" +-artifactRepositoryName "Eclipse JDT" \ +-metadataRepositoryName "Eclipse JDT" # SDK sdkMetadata=$sdkDir/metadata-SDK @@ -956,13 +939,13 @@ org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -metadataRepository file:$sdkMetadata \ -artifactRepository file:$sdkMetadata \ -source $sdkDir \ --root "Fedora Eclipse SDK" \ +-root "Eclipse SDK" \ -rootVersion %{version} \ -flavor tooling \ -publishArtifacts \ -append \ --artifactRepositoryName "Fedora Eclipse SDK" \ --metadataRepositoryName "Fedora Eclipse SDK" +-artifactRepositoryName "Eclipse SDK" \ +-metadataRepositoryName "Eclipse SDK" # Director config.ini mv $installDir/configuration/config.ini{,.bak} @@ -979,7 +962,7 @@ org.eclipse.core.launcher.Main \ org.eclipse.equinox.p2.director.app.application \ -debug -consolelog \ -flavor tooling \ --installIU "Fedora Eclipse Platform" \ +-installIU "Eclipse Platform" \ -version %{version} \ -p2.os linux \ -p2.ws gtk \ @@ -1016,7 +999,7 @@ mv $provisionDir $sdkDir # Fix paths in p2 data rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml -sed -i "s|file\:$provisionDir/\ -\ bundle\ pool|Fedora Eclipse|g" \ +sed -i "s|file\:$provisionDir/\ -\ bundle\ pool|Eclipse Platform|g" \ $sdkDir/artifacts.xml profileDir=$sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry pushd $profileDir @@ -1033,9 +1016,6 @@ cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ $sdkDir/eclipse.ini # We have /usr/share/eclipse/dropins in eclipse.ini sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini -# Use our own splash -sed -i "s|org.eclipse.platform|org.fedoraproject.ide.platform|" $sdkDir/eclipse.ini - # Add a compatibility symlink to startup.jar pushd $sdkDir @@ -1121,11 +1101,6 @@ done popd %endif -# 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.platform.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \ @@ -1160,14 +1135,15 @@ ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar popd # Icons +PLATFORMVERSION=$(ls $sdkDir/plugins | grep org.eclipse.platform_ | sed 's/org.eclipse.platform_//') install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse48.png \ +ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/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 %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse32.png \ +ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/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 %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse.png \ +ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/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 @@ -1460,8 +1436,6 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.core.boot_* %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_* %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_* -%{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_* -%{_libdir}/%{name}/features/org.fedoraproject.ide.feature_* %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_* %{_libdir}/%{name}/plugins/org.eclipse.core.net_* %ifarch %{ix86} @@ -1591,6 +1565,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Tue May 19 2009 Andrew Overholt 1:3.5.0-0.2.8 +- Remove Fedora branding. + * Thu May 7 2009 Andrew Overholt 1:3.5.0-0.2.7 - Update patch to tests' library.xml to allow for easy debugging of tests. diff --git a/sources b/sources index 1eccae0..3da508b 100644 --- a/sources +++ b/sources @@ -1,6 +1,4 @@ 611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2 e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 -28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip 3e031f11b0de3f15b00233deec2b19f3 eclipse-3.4.2-testframework.tar.bz2 1c3bb4e384cbc5f4e2b7275238a010f7 eclipse-sourceBuild-srcIncluded-I20090416-1053.zip -9a644442e9b40b0311bee190701e77f5 org.fedoraproject.ide.platform-3.5.0.zip