SPECS: eclipse-subclipse.spec - package using prepackaged jars

glen glen at pld-linux.org
Tue Apr 14 13:29:10 CEST 2009


Author: glen                         Date: Tue Apr 14 11:29:10 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package using prepackaged jars

---- Files affected:
SPECS:
   eclipse-subclipse.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/eclipse-subclipse.spec
diff -u SPECS/eclipse-subclipse.spec:1.2 SPECS/eclipse-subclipse.spec:1.3
--- SPECS/eclipse-subclipse.spec:1.2	Tue Apr 14 13:06:36 2009
+++ SPECS/eclipse-subclipse.spec	Tue Apr 14 13:29:04 2009
@@ -1,34 +1,25 @@
 # $Revision$, $Date$
-%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.
@@ -43,69 +34,34 @@
 Subversion Revision Graph for Subclipse.
 
 %prep
-%setup -q -n subclipse-%{version}
-%patch0 -p1
+%setup -qc
 
-# 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
-
-%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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/04/14 11:29:04  glen
+- package using prepackaged jars
+
 Revision 1.2  2009/04/14 11:06:36  glen
 - fix fetch source script
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eclipse-subclipse.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list