- package using prepackaged jars

Changed files:
    eclipse-subclipse.spec -> 1.3

diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index c0f4cfa22ff751e28160db6f8c2a2837703c8f23..dcb509ea379898a89364a88ad842b39c3ecce91e 100644 (file)
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,33 +1,24 @@
-%define eclipse_name       eclipse
-%define eclipse_base       %{_libdir}/%{eclipse_name}
-%define install_loc        %{_datadir}/eclipse/dropins
-%define javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.5.4.1
-
+# TODO
+# - build from source (see r1.1 of the spec)
 Summary:       Subversion Eclipse plugin
 Name:          eclipse-subclipse
-Version:       1.4.7
+Version:       1.4.8
 Release:       0.1
 License:       EPL and CC-BY
 Group:         Development/Tools
 URL:           http://subclipse.tigris.org/
-Source0:       subclipse-%{version}.tgz
-# Source0-md5: 1b291cd89a7c51b343cfcf863fc1793c
+Source0:       http://subclipse.tigris.org/files/documents/906/45156/site-%{version}.zip
+# Source0-md5: b98324f5669956c7e79422de8c2447b8
 Source10:      %{name}.sh
-Patch0:                %{name}-dependencies.patch
-BuildRequires: ant
-BuildRequires: coreutils
-BuildRequires: eclipse-gef
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-svnkit >= 1.2.2
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: subversion-javahl >= 1.5
-Requires:      eclipse-platform
-Requires:      eclipse-svnkit >= 1.2.2
+Requires:      eclipse >= 3.3.1.1
+#Requires:     eclipse-svnkit >= 1.2.2
 Requires:      subversion-javahl >= 1.5
 Obsoletes:     eclipse-subclipse-book < 1.4
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                eclipsedir      %{_datadir}/eclipse
+
 %description
 Subclipse is an Eclipse plugin that adds Subversion integration to the
 Eclipse IDE.
@@ -42,66 +33,31 @@ Requires:   eclipse-gef
 Subversion Revision Graph for Subclipse.
 
 %prep
-%setup -q -n subclipse-%{version}
-%patch0 -p1
-
-# remove javahl sources
-rm -rf org.tigris.subversion.clientadapter.javahl/src/org/tigris/subversion/javahl
-ln -s %{_javadir}/svn-javahl.jar org.tigris.subversion.clientadapter.javahl
-
-# fixing wrong-file-end-of-line-encoding warnings
-sed -i 's/\r//' org.tigris.subversion.subclipse.graph/icons/readme.txt
+%setup -qc
 
-%build
-%{eclipse_base}/buildscripts/pdebuild                  \
-  -f org.tigris.subversion.clientadapter.feature \
-  -o `pwd`/orbitDeps
-%{eclipse_base}/buildscripts/pdebuild                             \
-  -f org.tigris.subversion.clientadapter.javahl.feature \
-  -o `pwd`/orbitDeps
-%{eclipse_base}/buildscripts/pdebuild                             \
-  -f org.tigris.subversion.clientadapter.svnkit.feature \
-  -o `pwd`/orbitDeps                                                                   \
-  -d svnkit
-%{eclipse_base}/buildscripts/pdebuild \
-  -f org.tigris.subversion.subclipse  \
-  -o `pwd`/orbitDeps
-%{eclipse_base}/buildscripts/pdebuild                    \
-  -f org.tigris.subversion.subclipse.graph.feature \
-  -o `pwd`/orbitDeps                                                      \
-  -d gef
+rm -f plugins/org.tigris.subversion.clientadapter.javahl.win32*.jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{install_loc}
-installBase=$RPM_BUILD_ROOT%{install_loc}
-install -d $installBase
-
-# installing features
-install -d $installBase/subclipse-clientadapter
-unzip -q -d $installBase/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
-install -d $installBase/subclipse-clientadapter-javahl
-unzip -q -d $installBase/subclipse-clientadapter-javahl build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
-install -d $installBase/subclipse-clientadapter-svnkit
-unzip -q -d $installBase/subclipse-clientadapter-svnkit build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
-install -d $installBase/subclipse
-unzip -q -d $installBase/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
-install -d $installBase/subclipse-graph
-unzip -q -d $installBase/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
-
-# replacing jar with links to system libraries
-rm $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}/svn-javahl.jar
-ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}
+install -d $RPM_BUILD_ROOT%{eclipsedir}/{features,plugins}
+cp -a features/* $RPM_BUILD_ROOT%{eclipsedir}/features
+cp -a plugins/* $RPM_BUILD_ROOT%{eclipsedir}/plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc org.tigris.subversion.subclipse.graph/icons/readme.txt
-%{install_loc}/subclipse
-%{install_loc}/subclipse-clientadapter*
-
+%{eclipsedir}/features/org.tigris.subversion.*
+%{eclipsedir}/plugins/org.tigris.subversion.*
+# ext deps?
+%{eclipsedir}/features/com.sun.jna*.jar
+%{eclipsedir}/features/org.tmatesoft.svnkit*.jar
+%{eclipsedir}/plugins/com.sun.jna*.jar
+%{eclipsedir}/plugins/org.tmatesoft.svnkit*.jar
+
+%if 0
 %files graph
 %defattr(644,root,root,755)
 %{install_loc}/subclipse-graph
+%endif