? .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