From d556b206096ee4404d65f99137e5f6aade330024 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Oct 05 2007 15:49:05 +0000
Subject: - Update branding plugin.

- Add branding feature. This fixes the update manager issue when using the
    Fedora-branded product.
- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track down
    this issue.

---

diff --git a/.cvsignore b/.cvsignore
index f543d4e..1c3d27e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 eclipse-fileinitializerapp.tar.bz2
 eclipse-sourceBuild-srcIncluded-3.3.zip
-org.fedoraproject.ide.platform-3.3.0.3.zip
+org.fedoraproject.ide.feature-1.0.0.zip
+org.fedoraproject.ide.platform-3.3.0.4.zip
diff --git a/eclipse.spec b/eclipse.spec
index 469bcd7..ccacd6a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -19,7 +19,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        23%{?dist} 
+Release:        24%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -27,11 +27,17 @@ Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706
 Source2:        %{name}.desktop
 Source3:        eclipse.in
 # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
-#   -r fedoraeclipse-3_3_0-3 branding/org.fedoraproject.ide.platform
+#   -r fedoraeclipse-3_3_0-4 branding/org.fedoraproject.ide.platform
 # cd branding
-# zip -r org.fedoraproject.ide.platform-3.3.0.3.zip \
+# zip -r org.fedoraproject.ide.platform-3.3.0.4.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-%{version}.3.zip
+Source4:        org.fedoraproject.ide.platform-%{version}.4.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
 Source18:       ecj.sh.in
@@ -757,6 +763,8 @@ cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initial
 
 # Install the Fedora Eclipse product plugin
 unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins %{SOURCE4}
+# Install the Fedora Eclipse product feature
+unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/features %{SOURCE5}
 
 # 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
@@ -1353,6 +1361,7 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
 %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform
+%{_datadir}/%{name}/feature/org.fedoraproject.ide.feature
 %ifarch %{ix86} x86_64 ppc
 %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
 %endif
@@ -1564,6 +1573,13 @@ fi
 %endif
 
 %changelog
+* Fri Oct 05 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-24
+- Update branding plugin.
+- Add branding feature.  This fixes the update manager issue when using
+  the Fedora-branded product.
+- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track
+  down this issue.
+
 * Wed Oct 03 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-23
 - Build gcj bits on x86 and x86_64.
 - Add instructions for how to get source of branding plugin.
diff --git a/sources b/sources
index f41b167..a0560a7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
-7740118d20599e4ae707f8f9322a02ac  org.fedoraproject.ide.platform-3.3.0.3.zip
+28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
+abd1258d97962ca34007822467f08778  org.fedoraproject.ide.platform-3.3.0.4.zip