[eclipse-subclipse/f20: 2/2] Update to latest upstream release

Mat Booth mbooth at fedoraproject.org
Fri Jul 18 14:50:11 UTC 2014 

commit 0f6ad9e573168450a1ebeeda6e03dfe814e80895
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jul 18 15:49:17 2014 +0100

    Update to latest upstream release
    
    - Drop ancient obsoletes on subclipse-book, drop unnecessary BRs
    - Fix bogus dates in changelog
    - Install license files as %doc

 .gitignore             |   20 ++----------
 eclipse-subclipse.spec |   81 ++++++++++++++++++++----------------------------
 sources                |    2 +-
 subclipse-fetch.sh     |    2 +-
 4 files changed, 39 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71e0522..43002c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,6 @@
-subclipse-1.6.0.tgz
-subclipse-1.6.2.tgz
-subclipse-1.6.4.tgz
-subclipse-1.6.5.tgz
-subclipse-1.6.6.tgz
-subclipse-1.6.7.tgz
-subclipse-1.6.8.tgz
-subclipse-1.6.10.tgz
-subclipse-1.6.12.tgz
-subclipse-1.6.15.tar.xz
-subclipse-1.6.16.tar.xz
-/subclipse-1.6.17.tar.xz
-subclipse-1.6.18.tar.xz
-subclipse-1.8.5.tar.xz
 /noarch
 /subclipse-*
-subclipse-1.8.13.tar.xz
 /.project
-/adapter-1.8.21
-/adapter-1.8.22
+/adapter-*
+/.build-*.log
+/*.src.rpm
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index aef73a4..69fa663 100644
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,17 +1,10 @@
-%global eclipse_name       eclipse
-%global eclipse_base       %{_libdir}/%{eclipse_name}
 %global install_loc        %{_datadir}/eclipse/dropins
-%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.8.3
-
-# Add a comment to have something to commit to try to reproduce Adam
-# Williamson's deadlock bug.
 
 Name:           eclipse-subclipse
-Version:        1.10.2
-Release:        3%{?dist}
+Version:        1.10.5
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
-Group:          Development/Tools
 License:        EPL and CC-BY
 URL:            http://subclipse.tigris.org/
 Source0:        subclipse-%{version}.tar.xz
@@ -21,17 +14,12 @@ Patch0:         eclipse-subclipse-1.8.13-dependencies.patch
 
 BuildArch:              noarch
 
-BuildRequires:          ant
-BuildRequires:          jpackage-utils >= 0:1.6
-BuildRequires:          coreutils
-BuildRequires:          eclipse-pde >= 4.2.0-0.6
+BuildRequires:          eclipse-pde >= 4.3.2
 BuildRequires:          eclipse-gef
-Requires:               eclipse-platform >= 4.2.0-0.6
-
-BuildRequires:          subversion-javahl >= 1.8.3
-Requires:               subversion-javahl >= 1.8.3
+Requires:               eclipse-platform >= 4.3.2
 
-Obsoletes:              eclipse-subclipse-book < 1.4
+BuildRequires:          subversion-javahl >= 1.8.9
+Requires:               subversion-javahl >= 1.8.9
 
 %description
 Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse
@@ -39,14 +27,12 @@ IDE.
 
 %package graph
 Summary:        Subversion Revision Graph
-Group:          Development/Tools
 Requires:       %{name} = %{version}
 Requires:       eclipse-gef
 
 %description graph
 Subversion Revision Graph for Subclipse.
 
-
 %prep
 %setup -q -n subclipse-%{version}
 %patch0 -b .sav
@@ -58,16 +44,14 @@ 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-pdebuild -f org.tigris.subversion.clientadapter.feature 
 
 eclipse-pdebuild -f org.tigris.subversion.clientadapter.javahl.feature
  
 # Do not build svnkit as our svnkit package is outdated
-#%{eclipse_base}/buildscripts/pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"     \
-#  -f org.tigris.subversion.clientadapter.svnkit.feature \
-#  -d svnkit
+#eclipse-pdebuild -f org.tigris.subversion.clientadapter.svnkit.feature -d svnkit
+
 eclipse-pdebuild -f org.tigris.subversion.subclipse
   
 eclipse-pdebuild -f org.tigris.subversion.subclipse.graph.feature -d gef
@@ -76,40 +60,43 @@ eclipse-pdebuild -f org.tigris.subversion.subclipse.graph.feature -d gef
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
 
-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
-unzip -q -d $installBase/subclipse-clientadapter-javahl build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
-#install -d -m 755 $installBase/subclipse-clientadapter-svnkit
-#unzip -q -d $installBase/subclipse-clientadapter-svnkit build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
-install -d -m 755 $installBase/subclipse
-unzip -q -d $installBase/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
-install -d -m 755 $installBase/subclipse-graph
-unzip -q -d $installBase/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
+#unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse-graph
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
 
 # replacing jar with links to system libraries
-pushd $installBase/subclipse-clientadapter-javahl/eclipse/plugins/
-unzip %{javahl_plugin_name}.jar -d %{javahl_plugin_name}
-rm %{javahl_plugin_name}.jar
-cd %{javahl_plugin_name}
+pushd $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter/eclipse/plugins/
+ADAPTER_JAVAHL=$(ls org.tigris.subversion.clientadapter.javahl_*.jar)
+unzip $ADAPTER_JAVAHL -d ${ADAPTER_JAVAHL%.jar}
+rm $ADAPTER_JAVAHL
+cd ${ADAPTER_JAVAHL%.jar}
 rm svn-javahl.jar
-ln -s %{_javadir}/svn-javahl.jar
+ln -s /usr/share/java/svn-javahl.jar
 popd
 
 %files
+%doc org.tigris.subversion.subclipse.feature/license.html
 %{install_loc}/subclipse
-%{install_loc}/subclipse-clientadapter*
-%doc org.tigris.subversion.subclipse.graph/icons/readme.txt
+%{install_loc}/subclipse-clientadapter
 
 %files graph
+%doc org.tigris.subversion.subclipse.graph.feature/license.html
+%doc org.tigris.subversion.subclipse.graph/icons/readme.txt
 %{install_loc}/subclipse-graph
 
-
 %changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 1.10.5-1
+- Update to latest upstream release
+- Drop ancient obsoletes on subclipse-book, drop unnecessary BRs
+- Fix bogus dates in changelog
+- Install license files as %%doc
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -210,7 +197,7 @@ popd
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
+* Sun Apr 26 2009 Robert Marcano <robert at marcanoonline.com> 1.6.0-1
 - Update to upstream 1.6.0
 
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.7-4
@@ -281,7 +268,7 @@ automatically activating bundle org.tigris.subversion.subclipse.core
 - svnClientAdapter documentation files added. Subclipse includes an eclipse
   based documentation for the plugins
 
-* Sat Aug 06 2006 Robert Marcano <robert at marcanoonline.com> 1.1.4-1
+* Sun Aug 06 2006 Robert Marcano <robert at marcanoonline.com> 1.1.4-1
 - Update to upstream 1.1.4
 - License changed to EPL
 - svnClientAdapter-1.1.4-javac-target.patch added fix to svnClientAdapter ant
diff --git a/sources b/sources
index 61c7c42..6514497 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b39842817924e5886e45daae9a9f3479  subclipse-1.10.2.tar.xz
+724668328027821486f7258c80d151fa  subclipse-1.10.5.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index de94b88..46f22ce 100755
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.10.2
+VERSION=1.10.5
 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
 
 #those sources are missing from the plugin, so copy them back!

More information about the scm-commits mailing list