rpms/eclipse-subclipse/devel eclipse-subclipse-1.4.7-dependencies.patch, NONE, 1.1 eclipse-subclipse.spec, 1.27, 1.28

[Robert Marcano]

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736

Modified Files:
	eclipse-subclipse.spec 
Added Files:
	eclipse-subclipse-1.4.7-dependencies.patch 
Log Message:
Remove internal embedded javahl sources, replacing it with system javahl link


eclipse-subclipse-1.4.7-dependencies.patch:

--- NEW FILE eclipse-subclipse-1.4.7-dependencies.patch ---
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/build.properties subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/build.properties
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/build.properties	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/build.properties	2009-02-24 21:29:54.000000000 -0430
@@ -1,5 +1,5 @@
-source.. = src/
-output.. = bin/
+source.clientadapter-javahl.jar = src/
+output.clientadapter-javahl.jar = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
@@ -7,4 +7,5 @@
                about.ini,\
                about.properties,\
                epl-v10.html,\
-               svn.gif
+               svn.gif,\
+               svn-javahl.jar
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2009-02-24 21:35:03.000000000 -0430
@@ -8,6 +8,9 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.tigris.subversion.clientadapter;bundle-version="[1.5.1,1.6.0)"
 Eclipse-LazyStart: true
+Bundle-ClassPath: clientadapter-javahl.jar,
+ svn-javahl.jar,
+ .
 Export-Package: org.tigris.subversion.javahl,
  org.tigris.subversion.svnclientadapter.javahl
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Naur subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl.feature/feature.xml
--- subclipse-1.4.7.original/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-24 20:14:44.000000000 -0430
+++ subclipse-1.4.7/org.tigris.subversion.clientadapter.javahl.feature/feature.xml	2009-02-24 21:16:55.000000000 -0430
@@ -33,14 +33,14 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
-   <plugin
+<!--   <plugin
          id="org.tigris.subversion.clientadapter.javahl.win32"
          os="win32"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"/>
+         fragment="true"/>-->
 
 </feature>


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- eclipse-subclipse.spec	24 Feb 2009 21:27:45 -0000	1.27
+++ eclipse-subclipse.spec	25 Feb 2009 02:33:10 -0000	1.28
@@ -1,10 +1,12 @@
-%define eclipse_name    eclipse
-%define eclipse_base    %{_libdir}/%{eclipse_name}
-%define install_loc     %{_datadir}/eclipse/dropins
+%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
+
 
 Name:           eclipse-subclipse
 Version:        1.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Development/Tools
@@ -13,6 +15,7 @@
 Source0:        subclipse-%{version}.tgz
 # Script to fetch the source code
 Source10:       subclipse-fetch-%{version}.sh
+Patch0:         eclipse-subclipse-1.4.7-dependencies.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +30,8 @@
 
 BuildRequires:          eclipse-svnkit >= 1.2.2
 Requires:               eclipse-svnkit >= 1.2.2
+BuildRequires:          subversion-javahl >= 1.5
+Requires:               subversion-javahl >= 1.5
 
 Obsoletes:              eclipse-subclipse-book < 1.4
 
@@ -47,6 +52,11 @@
 
 %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
@@ -79,6 +89,7 @@
 installBase=$RPM_BUILD_ROOT%{install_loc}
 install -d -m 755 $installBase
 
+# installing features
 install -d -m 755 $installBase/subclipse-clientadapter
 unzip -q -d $installBase/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
 install -d -m 755 $installBase/subclipse-clientadapter-javahl
@@ -90,6 +101,10 @@
 install -d -m 755 $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}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,7 +123,7 @@
 
 
 %changelog
-* Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-2
+* Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-3
 - Update to upstream 1.4.7
 - eclipse-subclipse-book is obsoleted, not provided upstream
 - New eclipse-subclipse-graph subpackage