From f5370cf6521d2a86ffe294679f2594061a984e97 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Oct 03 2008 20:33:02 +0000
Subject: - Don't re-pack JARs (see fedora-devel-java-list discussion in September

    2008).
- Update desktop-file-install usage and add --vendor=fedora.

---

diff --git a/eclipse.spec b/eclipse.spec
index 71fa5d0..5472d84 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,11 +1,10 @@
 # TODO:
 # - update ecj-rpmdebuginfo patch
 # - look at startup script and launcher patches
-# - get Ganymede update site pre-configured
+# - get Ganymede update site pre-configured (https://bugs.eclipse.org/249133)
 # - investigate bi-arch requirements
 # - see why about.html isn't being copied on ppc
 # - fix ant libs
-# - update fedora feature version
 Epoch:  1
 
 %define eclipse_major   3
@@ -21,6 +20,12 @@ Epoch:  1
 %define eclipse_arch   %{_arch}
 %endif
 
+# FIXME:  update java packaging guidelines for this.  See
+# fedora-devel-java-list discussion in September 2008.
+# 
+# Prevent brp-java-repack-jars from being run.
+%define __jar_repack 0
+
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
@@ -1101,7 +1106,8 @@ sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj
 desktop-file-validate %{SOURCE2}
 
 # freedesktop.org menu entry
-install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor="fedora" \
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
@@ -1503,6 +1509,8 @@ fi
 * Fri Oct 03 2008 Andrew Overholt <overholt@redhat.com> 3.4.1-1
 - Symlink to ant-apache-bsf and ant-commons-net.
 - Update branding.
+- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008).
+- Update desktop-file-install usage and add --vendor=fedora.
 
 * Thu Oct 03 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-0
 - 3.4.1