diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec index cf61534..183fbb1 100644 --- a/eclipse-subclipse.spec +++ b/eclipse-subclipse.spec @@ -1,9 +1,10 @@ -%define gcj_support 1 +%define gcj_support 0 %define eclipse_name eclipse -%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} +%define eclipse_base %{_libdir}/%{eclipse_name} +%define install_loc %{_datadir}/eclipse/dropins +%define core_plugin_jar %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}.jar +%define core_plugin_dir %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version} %define disable_javahl 0 %if 0%{?fedora} == 6 @@ -20,7 +21,7 @@ Name: eclipse-subclipse Version: 1.2.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Subversion Eclipse plugin Group: Text Editors/Integrated Development Environments (IDE) @@ -107,7 +108,7 @@ ln -s %{_javadir}/ganymed-ssh2.jar subclipse/core/lib/ganymed.jar # --------------------------------- # building svnClientAdapter pushd svnClientAdapter -ant svnClientAdapter.jar +%{ant} svnClientAdapter.jar popd # copying svnClientAdapter inside subclipse module @@ -116,60 +117,9 @@ cp svnClientAdapter/build/lib/svnClientAdapter.jar subclipse/core/lib/svnClientA # --------------------------------- # building subclipse pushd subclipse -# 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. -mkdir home -homedir=$(cd home > /dev/null && pwd) - -# build the main subclipse feature -eclipse \ - -application org.eclipse.ant.core.antRunner \ - -Duser.home=$homedir \ - -Dtype=feature \ - -Did=org.tigris.subversion.subclipse \ - -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 -#java -cp %{eclipse_base}/startup.jar \ -# -Duser.home=$homedir \ -# org.eclipse.core.launcher.Main \ -# -application org.eclipse.ant.core.antRunner \ -# -Dtype=feature \ -# -Did=org.tigris.subversion.subclipse \ -# -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 - -# build the subclipse book feature -eclipse \ - -application org.eclipse.ant.core.antRunner \ - -Duser.home=$homedir \ - -Dtype=feature \ - -Did=org.tigris.subversion.book \ - -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 -#java -cp %{eclipse_base}/startup.jar \ -# -Duser.home=$homedir \ -# org.eclipse.core.launcher.Main \ -# -application org.eclipse.ant.core.antRunner \ -# -Dtype=feature \ -# -Did=org.tigris.subversion.book \ -# -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 -f org.tigris.subversion.subclipse +%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book # returning to base build directory popd @@ -182,14 +132,17 @@ mkdir -p subclipse/org/tigris/subversion/subclipse ln -s $(pwd)/subclipse/core/src/org/tigris/subversion/subclipse/core subclipse/org/tigris/subversion/subclipse ln -s $(pwd)/subclipse/ui/src/org/tigris/subversion/subclipse/ui subclipse/org/tigris/subversion/subclipse - %install rm -rf $RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base} +install -d -m 755 $RPM_BUILD_ROOT%{install_loc} +installDir=$RPM_BUILD_ROOT%{install_loc}/subclipse +install -d -m 755 $installDir +install -d -m 755 ${installDir}-book 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 +unzip -q -d $installDir build/rpmBuild/org.tigris.subversion.subclipse.zip +unzip -q -d ${installDir}-book build/rpmBuild/org.tigris.subversion.book.zip +popd # repacking core plugin as a directory based plugin, needed in order to replace some jars with symlinks mkdir $RPM_BUILD_ROOT%{core_plugin_dir} @@ -225,22 +178,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{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_* +%{install_loc}/subclipse %doc svnClientAdapter/readme.txt svnClientAdapter/changelog.txt svnClientAdapter/license.txt - %if %{gcj_support} %{_libdir}/gcj/%{name} %endif %files book %defattr(-,root,root) -%{eclipse_base}/features/org.tigris.subversion.book_* -%{eclipse_base}/plugins/org.tigris.subversion.book_* +%{install_loc}/subclipse-book %changelog +* Mon Oct 13 2008 Alexander Kurtakov - 1.2.4-11 +- Fix build with eclipse 3.4. + * Sun Sep 21 2008 Ville Skyttä - 1.2.4-10 - Fix Patch0:/%%patch mismatch.