rpms/eclipse-subclipse/devel eclipse-subclipse.spec,1.18,1.19

[Robert Marcano (robmv)]

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20864

Modified Files:
	eclipse-subclipse.spec 
Log Message:
- Fix Bug 440818: changed links to svn-javahl.jar



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- eclipse-subclipse.spec	19 Feb 2008 22:16:35 -0000	1.18
+++ eclipse-subclipse.spec	4 Apr 2008 20:34:17 -0000	1.19
@@ -13,10 +13,14 @@
 %define disable_javahl  1
 %endif
 
+%define javahl_dir      %{_libdir}/svn-javahl
+%if 0%{?fedora} >= 8
+%define javahl_dir      %{_javadir}
+%endif
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -83,14 +87,14 @@
 
 # delete the jars that are in the archive
 rm svnClientAdapter/lib/svnjavahl.jar
-ln -sf %{_libdir}/svn-javahl/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar
+ln -sf %{javahl_dir}/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar
 rm -f svnClientAdapter/lib/svnkit.jar
 ln -sf %{_javadir}/svnkit.jar svnClientAdapter/lib/svnkit.jar
 rm -f svnClientAdapter/lib/ganymed.jar
 ln -sf %{_javadir}/ganymed-ssh2.jar svnClientAdapter/lib/ganymed.jar
 
 rm -f subclipse/core/lib/svnjavahl.jar
-ln -sf %{_libdir}/svn-javahl/svn-javahl.jar subclipse/core/lib/svnjavahl.jar
+ln -sf %{javahl_dir}/svn-javahl.jar subclipse/core/lib/svnjavahl.jar
 rm -f subclipse/core/lib/svnClientAdapter.jar
 # svnClientAdapter.jar is copied after being built
 rm -f subclipse/core/lib/svnkit.jar
@@ -206,7 +210,7 @@
 
 # We need to setup the symlink because the ant copy task doesn't preserve symlinks
 # TODO file a bug about this
-ln -s %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
+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
 
@@ -237,6 +241,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Fri Apr 04 2008 Robert Marcano <robert at marcanoonline.com> 1.2.4-8
+- Fix Bug 440818: changed links to svn-javahl.jar
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-7
 - Autorebuild for GCC 4.3