[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Eclipse 3.4



Hi,

I've finally got version 3.4 of the Eclipse SDK ready to go, targetting
Fedora 10:

http://koji.fedoraproject.org/koji/buildinfo?buildID=58121

(See [1] for an in-progress build with some minor fixes.)

Action item for plugin package maintainers:
-------------------------------------------
Please look at the relevant attached patches and apply them or something
like them in the devel directory of your plugin(s).  Feel free to commit
and tag but note that you won't be able to build until I tag the build
for rawhide.
    
Email me personally if you have questions.  Please also let me know when
you're finished and I can do koji builds of everything in the right
order (chain-build or otherwise).  I'd like to do this very soon so
please take a few minutes to apply the changes.

Testing of the above build is greatly appreciated.
-------------------------------------------

There are a few minor changes for packagers of plugins/features:

- Bits are now installed to %{_libdir}/eclipse instead of
  %{_datadir}/eclipse.  This brings us in line with upstream's file layout
  and avoids the crazy split-install osgi.sharedConfiguration.area hack.
  It's also what Debian does, FWIW.

- p2 is the new provisioning platform in 3.4.  Essentially it replaces the
  old update manager but does other things as well.  It requires
  Eclipse-based apps to use profiles -- like Mozilla profiles -- and manage
  them using its "director".  In order to avoid fragile %post scriptlets,
  we're going to use the "dropins mechanism" for plugin installation.  This
  means that all non-Eclipse platform plugins will be installed into their
  own directory under %{_libdir}/eclipse/dropins.  There are a variety of
  layouts that are acceptable to p2, but we'll largely be going with
  dropins/eclipse/<short name>/{plugins,features}.  This has the nice side
  benefit of simplifying %files sections :) .  See [2] for more
  information here.

- I added a flag to the pdebuild script to allow for Orbit-style
  dependencies.  If you don't know what this means, that's okay, but if
  a plugin you want to package uses Orbit dependencies, you'll want to
  use the -o flag to pdebuild.  Plugins that use non-Eclipse JARs but
  don't have a lib directory with JARs are probably using Orbit-style
  dependencies.  They'll have Require-Bundle or Import-Package entries
  in their plugin MANIFEST.MFs.  See eclipse-mylyn for an example of how
  to use pdebuild in this case.

- I've renamed (and Obsoleted/Provided) libswt3-gtk2 to eclipse-swt.  I
  can't count the number of times people have been confused by this
  naming and since we're not going to ship swt2 or swt.motif any time
  soon, the naming is silly.  I also folded pde-runtime into pde since
  PHPEclipse no longer needs the separate pde-runtime package.

Outside of the CDT and the SELinux tools (both maintainers are working on
the necessary changes themselves), I've got patches for all of the plugins
we have as packages in Fedora.  I've attached these patches and CC'd all of
the maintainers.

I will update the packaging guidelines very soon with the above
information.

Thanks,

Andrew

[1]
Build with branding fixed and removing some unnecessary Requires(post)
and the pde-runtime package which is now folded into pde:
http://koji.fedoraproject.org/koji/taskinfo?taskID=750696

[2]
There are some performance considerations here.  Since it's generating
the associated metadata and "provisioning" the bits on the fly based on
files dropped into a directory, users may notice a slightly longer
startup the first time they start the Eclipse IDE after installing a new
plugin package.  Subsequent startups won't be impacted.  There is a lot
of performance improvement work going on upstream and much of it will
land in 3.4.1.  If 3.4.1 is released early enough, we'll ship it in
Fedora 10.  If not, we can ship it as an update.  Should testing between
now and Fedora 10 show unacceptably poor performance (I haven't noticed
this in my own testing), we can look at back-porting some of the
performance work.  The other main way of speeding up dropins-installed
plugins is by shipping pre-generated p2 metadata (like yum metadata).
I've experimented with this and think I can make it so that we
transparently generate it via pdebuild meaning it would only require a
rebuild of Fedora plugin packages.  Things will work without these
generated content.xml files so in the interest of getting testing sooner
rather than later, I'm going to push ahead without the metadata for
dropins.
? .build-1.2.4-10.fc10.log
? eclipse-subclipse-1.2.4-10.fc10.src.rpm
? noarch
? subclipse-1.2.4
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.20
diff -u -r1.20 eclipse-subclipse.spec
--- eclipse-subclipse.spec	7 Apr 2008 13:50:59 -0000	1.20
+++ eclipse-subclipse.spec	30 Jul 2008 23:02:20 -0000
@@ -1,9 +1,15 @@
 %define gcj_support     1
 
 %define eclipse_name    eclipse
+%if 0%{?rhel} == 5
 %define eclipse_base    %{_datadir}/%{eclipse_name}
 %define core_plugin_jar %{eclipse_base}/plugins/org.tigris.subversion.subclipse.core_%{version}.jar
 %define core_plugin_dir %{eclipse_base}/plugins/org.tigris.subversion.subclipse.core_%{version}
+%else
+%define eclipse_base    %{_libdir}/%{eclipse_name}
+%define core_plugin_jar %{eclipse_base}/dropins/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}.jar
+%define core_plugin_dir %{eclipse_base}/dropins/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}
+%endif
 
 %define disable_javahl  0
 %if 0%{?fedora} == 6
@@ -20,7 +26,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -116,13 +122,10 @@
 # ---------------------------------
 # building subclipse
 pushd subclipse
+%if 0%{?rhel} == 5
 # See comments in the script to understand this.
 # RHEL eclipse has a different instalation root
-%if 0%{?rhel} == 5
 /bin/sh -x %{_libdir}/%{eclipse_name}/buildscripts/copy-platform SDK %{eclipse_base}
-%else
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-%endif
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -171,6 +174,10 @@
 #     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
 #     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
 
+%else
+%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.subclipse
+%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book
+%endif
 # returning to base build directory
 popd
 
@@ -185,12 +192,23 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if 0%{?rhel} == 5
 install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
-
 pushd subclipse
 unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.tigris.subversion.subclipse.zip
 unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.tigris.subversion.book.zip
+popd
+%else
+installDir=$RPM_BUILD_ROOT%{eclipse_base}/dropins/subclipse
+install -d -m 755 $installDir
+install -d -m 755 ${installDir}-book
+pushd subclipse
+unzip -q -d $installDir build/rpmBuild/org.tigris.subversion.subclipse.zip
+unzip -q -d ${installDir}-book build/rpmBuild/org.tigris.subversion.book.zip
+popd
+%endif
 
+pushd subclipse
 # repacking core plugin as a directory based plugin, needed in order to replace some jars with symlinks
 mkdir $RPM_BUILD_ROOT%{core_plugin_dir}
 unzip -q -d $RPM_BUILD_ROOT%{core_plugin_dir} $RPM_BUILD_ROOT%{core_plugin_jar}
@@ -198,22 +216,23 @@
 # packaging .class files as a jar file
 jar -cf $RPM_BUILD_ROOT%{core_plugin_dir}/lib/subclipse-core.jar -C $RPM_BUILD_ROOT%{core_plugin_dir} org
 rm -rf $RPM_BUILD_ROOT%{core_plugin_dir}/org
+popd
 
 # removing core plugin internal jars
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
 rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
 
-%if %{gcj_support}
-  aot-compile-rpm
-%endif
-
 # We need to setup the symlink because the ant copy task doesn't preserve symlinks
 # TODO file a bug about this
 ln -s %{javahl_dir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
 ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
 ln -s %{_javadir}/ganymed-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
 
+%if %{gcj_support}
+  aot-compile-rpm
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -225,10 +244,14 @@
 
 %files
 %defattr(-,root,root)
+%if 0%{?rhel} == 5
 %{eclipse_base}/features/org.tigris.subversion.subclipse_*
 %{eclipse_base}/plugins/org.tigris.subversion.subclipse.core_*
 %{eclipse_base}/plugins/org.tigris.subversion.subclipse.ui_*
 %{eclipse_base}/plugins/org.tigris.subversion.subclipse.doc_*
+%else
+%{eclipse_base}/dropins/subclipse
+%endif
 %doc svnClientAdapter/readme.txt svnClientAdapter/changelog.txt svnClientAdapter/license.txt 
 
 %if %{gcj_support}
@@ -237,10 +260,17 @@
 
 %files book
 %defattr(-,root,root)
+%if 0%{?rhel} == 5
 %{eclipse_base}/features/org.tigris.subversion.book_*
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
+%else
+%{eclipse_base}/dropins/subclipse-book
+%endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 1.2.4-10
+- Update for Eclipse SDK 3.4
+
 * Fri Apr 04 2008 Robert Marcano <robert marcanoonline com> 1.2.4-9
 - Fix Bug 440818: changed links to svn-javahl.jar
 
? .build-0.4.0-2.fc10.log
? specfile-editor-fetched-src-18653
Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.17
diff -u -r1.17 eclipse-rpm-editor.spec
--- eclipse-rpm-editor.spec	29 Jun 2008 14:12:39 -0000	1.17
+++ eclipse-rpm-editor.spec	30 Jul 2008 22:59:17 -0000
@@ -1,10 +1,10 @@
 %define gcj_support         1
-%define eclipse_base        %{_datadir}/eclipse
+%define eclipse_base        %{_libdir}/eclipse
 %define svn_rev             18653
 
 Name:           eclipse-rpm-editor
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
@@ -23,9 +23,6 @@
 %else
 BuildRequires:    java-devel >= 1.5.0
 %endif
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
 BuildRequires: eclipse-pde >= 1:3.3.0
 BuildRequires: eclipse-changelog >= 2.5.1
 Requires: eclipse-platform >= 3.3.1 
@@ -57,8 +54,9 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. \
+installDir=%{buildroot}%{eclipse_base}/dropins/rpm-editor
+install -d -m 755 $installDir
+unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.rpm.ui.editor.zip
 
 %if %{gcj_support}
@@ -84,18 +82,19 @@
 
 %files
 %defattr(-,root,root,-)
-%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.ui.editor_*.jar
-%{eclipse_base}/plugins/org.eclipse.linuxtools.rpm.rpmlint_*.jar
-%dir %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/
-%doc %{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.html
-%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.xml
-%{eclipse_base}/features/org.eclipse.linuxtools.rpm.ui.editor_*/*.properties
+%doc org.eclipse.linuxtools.rpm.ui.editor-feature/*.html
+%{eclipse_base}/dropins/rpm-editor
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/org.eclipse.linuxtools.rpm.*
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 0.4.0-2
+- Update for Eclipse SDK 3.4
+- Remove noarch potential since CDT is arch-specific and we
+  ExclusiveArch
+
 * Wed Jun 29 2008 Alphonse Van Assche <alcapcom fedoraproject org> 0.4.0-1
 - bump to 0.4.0
 
? .build-1.2.0-0.3.svn1573.fc10.log
? eclipse-phpeclipse-1.2.0-0.3.svn1573.fc10.src.rpm
? noarch
? phpeclipse-1.2.0
Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.6
diff -u -r1.6 eclipse-phpeclipse.spec
--- eclipse-phpeclipse.spec	29 Jun 2008 18:30:45 -0000	1.6
+++ eclipse-phpeclipse.spec	30 Jul 2008 22:58:50 -0000
@@ -1,9 +1,9 @@
-%define eclipse_base     %{_datadir}/eclipse
+%define eclipse_base     %{_libdir}/eclipse
 %define gcj_support      1
 
 Name:      eclipse-phpeclipse
 Version:   1.2.0
-Release:   0.2.svn1573%{?dist}
+Release:   0.3.svn1573%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -96,14 +96,15 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+installDir=%{buildroot}%{eclipse_base}/dropins/phpeclipse
+install -d -m 755 $installDir
+unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
 rm *.jar
 build-jar-repository -s -p . xml-commons-apis
 popd
@@ -122,37 +123,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/cpl-v10.html
-
-# main feature
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.externaltools_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.help_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phphelp_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.smarty.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.webbrowser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.ui_*
-
-# debug features
-%{eclipse_base}/features/net.sourceforge.phpeclipse.debug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.launching_*
-%{eclipse_base}/features/net.sourceforge.phpeclipse.xdebug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.ui_*
-
+%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
+%{eclipse_base}/dropins/phpeclipse
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 1.2.0-0.3.svn1573
+- Update for building against Eclipse SDK 3.4.
+
 * Sun Jun 29 2008 Mat Booth <fedora matbooth co uk> 1.2.0-0.2.svn1573
 - Add patch for Show External Preview functionality.
 - Add patch for Use External PHP Parser functionality.
? .build-0.6.24-3.fc10.log
? eclipse-epic-0.6.24-3.fc10.src.rpm
? epic-0.6.24
? noarch
? x86_64
Index: eclipse-epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-epic/devel/eclipse-epic.spec,v
retrieving revision 1.4
diff -u -r1.4 eclipse-epic.spec
--- eclipse-epic.spec	14 Jun 2008 12:37:41 -0000	1.4
+++ eclipse-epic.spec	30 Jul 2008 22:56:48 -0000
@@ -1,9 +1,9 @@
-%define eclipse_base     %{_datadir}/eclipse
+%define eclipse_base     %{_libdir}/eclipse
 %define gcj_support      1
 
 Name:      eclipse-epic
 Version:   0.6.24
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -99,18 +99,19 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/org.epic.feature.main.zip
+installDir=%{buildroot}%{eclipse_base}/dropins/epic
+install -d -m 755 $installDir
+unzip -q -d $installDir build/rpmBuild/org.epic.feature.main.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd %{buildroot}%{eclipse_base}/plugins/org.epic.lib_*/lib
+pushd $installDir/eclipse/plugins/org.epic.lib_*/lib
 rm *.jar
 build-jar-repository -s -p . jdom antlr gnu-regexp brazil
 popd
 
 # ensure source packages are correctly verisoned
-pushd %{buildroot}%{eclipse_base}/plugins
+pushd $installDir/eclipse/plugins
 for p in org.epic.perleditor \
          org.epic.regexp \
          org.epic.debug; do
@@ -133,19 +134,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{eclipse_base}/features/org.epic.feature.main_%{version}/license.html
-%{eclipse_base}/features/org.epic.feature.main_*
-%{eclipse_base}/plugins/org.epic.debug_*
-%{eclipse_base}/plugins/org.epic.doc_*
-%{eclipse_base}/plugins/org.epic.lib_*
-%{eclipse_base}/plugins/org.epic.perleditor_*
-%{eclipse_base}/plugins/org.epic.regexp_*
-%{eclipse_base}/plugins/org.epic.source_*
+%doc org.epic.feature.main/license.html
+%{eclipse_base}/dropins/epic
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 0.6.24-3
+- Update for building with Eclipse SDK 3.4
+
 * Sat Jun 14 2008 Mat Booth <fedora matbooth co uk> 0.6.24-2
 - Fixed package ownership of feature directory.
 
? .build-4.0.1-11.fc10.log
? eclipse-checkstyle-4.0.1
? eclipse-checkstyle-4.0.1-11.fc10.src.rpm
? noarch
Index: eclipse-checkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-checkstyle/devel/eclipse-checkstyle.spec,v
retrieving revision 1.5
diff -u -r1.5 eclipse-checkstyle.spec
--- eclipse-checkstyle.spec	19 Feb 2008 21:48:47 -0000	1.5
+++ eclipse-checkstyle.spec	30 Jul 2008 22:52:53 -0000
@@ -1,12 +1,12 @@
-%define eclipse_base %{_datadir}/eclipse
+%define eclipse_base %{_libdir}/eclipse
 %define cs_ver 4.1
-%define eclipse_ver 3.3
+%define eclipse_ver 3.4
 %define gcj_support 1
 
 Summary:   Checkstyle plugin for Eclipse
 Name:      eclipse-checkstyle
 Version:   4.0.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 License:   LGPLv2+
 Group:     Development/Tools
 URL:       http://eclipse-cs.sourceforge.net
@@ -73,14 +73,14 @@
 %{eclipse_base}/plugins/org.eclipse.core.filebuffers_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.core.resources_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.core.runtime_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.jdt.ui_%{eclipse_ver}.*.jar \
+%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.core_%{eclipse_ver}.*.jar \
+%{eclipse_base}/dropins/jdt/plugins/org.eclipse.jdt.ui_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.jface_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.jface.text_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.osgi_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.swt_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.team.core_%{eclipse_ver}.*.jar \
-%{eclipse_base}/plugins/org.eclipse.team.cvs.core_%{eclipse_ver}.*.jar \
+%{eclipse_base}/plugins/org.eclipse.team.cvs.core_*.jar \
 %{eclipse_base}/plugins/org.eclipse.text_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.ui_%{eclipse_ver}.*.jar \
 %{eclipse_base}/plugins/org.eclipse.ui.editors_%{eclipse_ver}.*.jar \
@@ -108,20 +108,21 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m755 %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+installDir=%{buildroot}/%{eclipse_base}/dropins/checkstyle
+install -d -m755 $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
 BUILD_DIR=`pwd`/CheckstylePlugin
 
 # install feature
-pushd %{buildroot}/%{eclipse_base}/features/com.atlassw.tools.eclipse.checkstyle_%{version}
+pushd $installDir/features/com.atlassw.tools.eclipse.checkstyle_%{version}
    jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-feature.jar
 popd
 
 # install plugin
-pushd %{buildroot}/%{eclipse_base}
+pushd $installDir
     jar xvf ${BUILD_DIR}/dist/com.atlassw.tools.eclipse.checkstyle_%{version}-bin.zip
     find . -type f -name '*src.zip' -print | xargs -t rm -f
     build-jar-repository \
-    %{buildroot}/%{eclipse_base}/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
+    $installDir/plugins/com.atlassw.tools.eclipse.checkstyle_%{version} \
     checkstyle-%{cs_ver} \
     checkstyle-optional-%{cs_ver} \
     commons-beanutils-core \
@@ -151,14 +152,16 @@
 %files
 %defattr(-,root,root)
 %doc CheckstylePlugin/license/LICENSE.*
-%{eclipse_base}/features/*
-%{eclipse_base}/plugins/*
+%{eclipse_base}/dropins/checkstyle
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 4.0.1-11
+- Update for Eclipse SDK 3.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng fedoraproject org> - 4.0.1-10
 - Autorebuild for GCC 4.3
 
? eclipse-changelog-2.6.2
Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.67
diff -u -r1.67 eclipse-changelog.spec
--- eclipse-changelog.spec	24 Jul 2008 21:07:31 -0000	1.67
+++ eclipse-changelog.spec	30 Jul 2008 21:42:01 -0000
@@ -1,11 +1,11 @@
 Epoch: 1
 
 %define gcj_support     1
-%define eclipse_base    %{_datadir}/eclipse
+%define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
 Version:        2.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
 Group:          Development/Tools 
@@ -69,32 +69,13 @@
 %setup -q -c -n eclipse-changelog-%{version}
 
 %build
-# See comments in the script to understand this.
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} cdt
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main ChangeLog feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Duser.home=$homedir                              \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.changelog                 \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK                               \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
+installDir=%{eclipse_base}/dropins/changelog
+install -d -m 755 $installDir
+unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.changelog.zip
 
 %if %{gcj_support}
@@ -111,12 +92,8 @@
 
 %files
 %defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.core_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.cparser_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.parsers.java_*
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.doc_*
-%doc %{eclipse_base}/features/org.eclipse.linuxtools.changelog_*/epl-v10.html
+%doc org.eclipse.linuxtools.changelog-feature/epl-v10.html
+%{eclipse_base}/dropins/changelog
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.core_*
@@ -125,6 +102,9 @@
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 1:2.6.2-2
+- Update for Eclipse SDK 3.4
+
 * Thu Jun 26 2008 Jeff Johnston <jjohnstn redhat com> 1:2.6.2-1
 - Rebase to 2.6.2
 - Resolves Bugzilla #452574
? .build-3.5.0-8.fc10.log
? eclipse-quickrex-3.5.0-8.fc10.src.rpm
? noarch
? quickrex-fetched-src-QuickREx_3_5_0
Index: eclipse-quickrex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-quickrex/devel/eclipse-quickrex.spec,v
retrieving revision 1.6
diff -u -r1.6 eclipse-quickrex.spec
--- eclipse-quickrex.spec	18 Feb 2008 19:08:46 -0000	1.6
+++ eclipse-quickrex.spec	30 Jul 2008 21:21:53 -0000
@@ -1,5 +1,5 @@
 %define gcj_support         1
-%define eclipse_base        %{_datadir}/eclipse
+%define eclipse_base        %{_libdir}/eclipse
 %define upstream_name       QuickREx
 %define cvs_tag             QuickREx_3_5_0
 %define oro_jar             jakarta-oro-2.0.8.jar
@@ -7,7 +7,7 @@
 
 Name:           eclipse-quickrex
 Version:        3.5.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        %{upstream_name} is a regular-expression test Eclipse Plug-In
 
 Group:          Development/Tools
@@ -69,37 +69,18 @@
 popd
 popd
 
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-mkdir home
-
 %build
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-homedir=$(cd home > /dev/null && pwd)
-
-java -cp $SDK/startup.jar \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
-     org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner \
-     -Dtype=feature \
-     -Did=de.babe.eclipse.plugins.QuickREx \
-     -DbaseLocation=$SDK \
-     -DsourceDirectory=$(pwd) \
-     -DbuildDirectory=$(pwd)/build \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir 
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. \
+installDir=%{buildroot}%{eclipse_base}/dropins/quickrex
+install -d -m 755 $installDir
+unzip -q -d $installDir \
  build/rpmBuild/de.babe.eclipse.plugins.QuickREx.zip
 
 # Re-symlink
-pushd  %{buildroot}/%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
+pushd  $installDir/eclipse/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
 rm %{oro_jar}
 rm %{regexp_jar}
 ln -s %{_javadir}/%{oro_jar}
@@ -129,16 +110,17 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}
-%doc %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/html
-%{eclipse_base}/features/de.babe.eclipse.plugins.QuickREx_%{version}
-%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/*
+%doc Plug-In/html
+%{eclipse_base}/dropins/quickrex
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/%{upstream_name}.*
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 3.5.0-8
+- Update to build against Eclipse SDK 3.4
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng fedoraproject org> - 3.5.0-7
 - Autorebuild for GCC 4.3
 
? .build-1.3.14-3.fc10.log
? .build-1.3.18-1.fc10.log
? META-INF
? about.html
? about_files
? clog
? eclipse-pydev-1.3.14
? eclipse-pydev-1.3.18
? eclipse-pydev-1.3.18-1.fc10.src.rpm
? noarch
? org.python.pydev.feature-src-1_3_18.zip
? plugin.properties
? test
Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.10
diff -u -r1.10 eclipse-pydev.spec
--- eclipse-pydev.spec	17 Jul 2008 19:05:07 -0000	1.10
+++ eclipse-pydev.spec	30 Jul 2008 21:05:48 -0000
@@ -1,26 +1,24 @@
 Epoch: 1
 
+%define eclipse_base        %{_libdir}/eclipse
 %define gcj_support         1
 
-# All arches line up except i386 -> x86
-%ifarch %{ix86}
-%define eclipse_arch    x86
-%else
-%define eclipse_arch   %{_arch}
-%endif
-
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.3.14
-Release:          2%{?dist}
+Version:          1.3.18
+Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.sourceforge.net/
 Group:            Development/Tools
 
-Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_14.zip
+Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_18.zip
 Source1:          org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 Source2:          fetch-pydev-mylyn.sh
 
+# Back-port from HEAD
+# http://pydev.cvs.sourceforge.net/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/CopiedWorkbenchLabelProvider.java?revision=1.3&view=markup
+Patch0:           %{name}-%{version}-compileerrors.patch
+
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.1.2
 BuildRequires:    java-1.5.0-gcj-devel >= 1.5.0
@@ -59,6 +57,7 @@
 
 %prep
 %setup -q -c 
+%patch0
 
 tar jxf %{SOURCE1}
 
@@ -108,66 +107,37 @@
 rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
 
 %build
-# Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse mylyn
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main pydev feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.python.pydev.feature                     \
-     -DbaseLocation=$SDK                               \
-     -DsourceDirectory=$(pwd)                          \
-     -DjavacSource=1.5  -DjavacTarget=1.5              \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir
+%{eclipse_base}/buildscripts/pdebuild \
+  -a "-DjavacSource=1.5  -DjavacTarget=1.5" \
+  -f org.python.pydev.feature
 
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64
-# build the pydev mylyn feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.python.pydev.mylyn.feature               \
-     -DbaseLocation=$SDK                               \
-     -DsourceDirectory=$(pwd)                          \
-     -DjavacSource=1.5  -DjavacTarget=1.5              \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir
+%{eclipse_base}/buildscripts/pdebuild \
+  -a "-DjavacSource=1.5  -DjavacTarget=1.5" \
+  -d mylyn \
+  -f org.python.pydev.mylyn.feature
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/eclipse
+installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/pydev
+install -d -m755 $installDir
+install -d -m755 ${installDir}-mylyn
 
 # pydev main feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
-            build/rpmBuild/org.python.pydev.feature.zip
+unzip -q -d $installDir build/rpmBuild/org.python.pydev.feature.zip
 
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64
 # pydev mylyn feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
-            build/rpmBuild/org.python.pydev.mylyn.feature.zip
+unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zip
 %endif
 
 # deal with linked deps
-pushd $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins
+pushd $installDir/eclipse/plugins
 rm -rf org.python.pydev.core_%{version}/commons-codec.jar
 ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
        org.python.pydev.core_%{version}/commons-codec.jar
@@ -196,20 +166,11 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/eclipse/features/org.python.pydev*
-%{_datadir}/eclipse/plugins/org.python.pydev_*
-%{_datadir}/eclipse/plugins/org.python.pydev.ast*
-%{_datadir}/eclipse/plugins/org.python.pydev.core*
-%{_datadir}/eclipse/plugins/org.python.pydev.debug*
-%{_datadir}/eclipse/plugins/org.python.pydev.help*
-%{_datadir}/eclipse/plugins/org.python.pydev.parser*
-%{_datadir}/eclipse/plugins/org.python.pydev.templates*
-%{_datadir}/eclipse/plugins/org.python.pydev.jython*
-%{_datadir}/eclipse/plugins/org.python.pydev.refactoring*
+%{eclipse_base}/dropins/pydev
 # no xmlrpc3 -> no mylyn on ppc64 due to:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 %ifnarch ppc64
-%{_datadir}/eclipse/plugins/org.python.pydev.mylyn*
+%{eclipse_base}/dropins/pydev-mylyn
 %endif 
 
 %if %{gcj_support}
@@ -217,6 +178,11 @@
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 1:1.3.18-1
+- 1.3.18
+- Update for building with Eclipse SDK 3.4
+- Back-port patch from HEAD for building against Eclipse SDK 3.4
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa redhat com> 1:1.3.14-2
 - fix license tag
 
? .build-4.0-1.b3.fc10.2.log
Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.2
diff -u -r1.2 eclipse-photran.spec
--- eclipse-photran.spec	19 Feb 2008 17:02:43 -0000	1.2
+++ eclipse-photran.spec	30 Jul 2008 16:19:18 -0000
@@ -2,20 +2,12 @@
 %define major                   4
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define eclipse_base            %{_datadir}/eclipse
-%define eclipse_lib_base        %{_libdir}/eclipse
-
-# All arches line up except i386 -> x86
-%ifarch %{ix86}
-%define eclipse_arch    x86
-%else
-%define eclipse_arch   %{_arch}
-%endif
+%define eclipse_base            %{_libdir}/eclipse
 
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}
-Release:        1.b3%{?dist}.1
+Release:        1.b3%{?dist}.2
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
@@ -66,43 +58,15 @@
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
 
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} cdt
-SDK=$(cd SDK >/dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-java -cp $SDK/startup.jar \
-        -Dosgi.sharedConfiguration.area=%{eclipse_lib_base}/configuration                        \
-        -Duser.home=$homedir                        \
-        org.eclipse.core.launcher.Main             \
-        -application org.eclipse.ant.core.antRunner       \
-        -Dtype=feature                                    \
-        -Did=org.eclipse.photran_feature                  \
-        -DsourceDirectory=$(pwd)                          \
-        -DbuildDirectory=$(pwd)/build                     \
-        -DbaseLocation=$SDK                               \
-        -DjavacSource=1.5 \
-        -DjavacTarget=1.5 \
-        -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-        -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml 
-
+%{eclipse_base}/buildscripts/pdebuild -d cdt \
+  -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
-
-unzip -d ${RPM_BUILD_ROOT}/%{_datadir} build/rpmBuild/org.eclipse.photran_feature.zip
+install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/photran
 
-# We move arch-specific plugins to libdir.
-mkdir -p ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins
-for archplugin in $(find ${RPM_BUILD_ROOT}%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do
-  mv $archplugin ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins
-  chmod -R 755 ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins/$(basename $archplugin)
-done
+unzip -d ${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/photran build/rpmBuild/org.eclipse.photran_feature.zip
 
 %if %{gcj_support}
 aot-compile-rpm
@@ -123,13 +87,17 @@
 %files
 %defattr(-,root,root)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/plugins/*
+%{eclipse_base}/dropins/photran
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 4.0-1.b3
+- Update for building against Eclipse SDK 3.4
+- Move everything to %%{_libdir}
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng fedoraproject org> - 4.0-1.b3.1
 - Autorebuild for GCC 4.3
 
? .build-0.3.1-2.fc10.log
? eclipse-egit-0.3.1
? eclipse-egit-0.3.1-2.fc10.src.rpm
? noarch
Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.13
diff -u -r1.13 eclipse-egit.spec
--- eclipse-egit.spec	17 Jul 2008 15:11:03 -0000	1.13
+++ eclipse-egit.spec	30 Jul 2008 16:14:12 -0000
@@ -4,7 +4,7 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.3.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL and GPLv2 and LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
@@ -40,35 +40,16 @@
 %setup -q -c 
 
 %build
-# Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main egit feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.spearce.egit                             \
-     -DbaseLocation=$SDK                               \
-     -DjavacSource=1.5  -DjavacTarget=1.5              \
-     -DsourceDirectory=$(pwd)                          \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir
+%{_libdir}/eclipse/buildscripts/pdebuild \
+   -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse
+installDir=$RPM_BUILD_ROOT/%{_libdir}/eclipse/dropins/egit
+install -d -m755 $installDir
 
 # egit main feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
+unzip -q -d $installDir/ \
             build/rpmBuild/org.spearce.egit.zip
 
 %if %{gcj_support}
@@ -85,16 +66,16 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/eclipse/features/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit.core*
-%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
-%{_datadir}/eclipse/plugins/org.spearce.jgit*
+%{_libdir}/eclipse/dropins/egit
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt redhat com> 0.3.1-2
+- Move files and update build for Eclipse SDK 3.4
+- Use pdebuild
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa redhat com> - 0.3.1-1
 - fix license tag
 

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]