[eclipse-collabnet-merge/f20: 3/3] Update to latest upstream release

[Mat Booth]

commit de1a304c0a91a9753ce8340bc6fc9ad0289fd85e
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jul 18 17:26:51 2014 +0100

    Update to latest upstream release
    
    - Update project URL

 .gitignore                   |   12 +++++-------
 eclipse-collabnet-merge.spec |   35 +++++++++++++----------------------
 get-collabnet-merge.sh       |    6 +++---
 sources                      |    2 +-
 4 files changed, 22 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe57d12..71c8a44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-collabnet-merge-2.0.0.tar.gz
-collabnet-merge-2.2.1.tar.gz
-/collabnet-merge-3.0.9.tar.gz
-/collabnet-merge-3.7.0.tar.gz
-/collabnet-merge-3.7.0
-/collabnet-merge-4.0.0.tar.gz
-/collabnet-merge-4.0.0
+/collabnet-merge-*
+/noarch
+/*.src.rpm
+/.project
+/.build-*.log
diff --git a/eclipse-collabnet-merge.spec b/eclipse-collabnet-merge.spec
index e5a4787..a9fc72a 100644
--- a/eclipse-collabnet-merge.spec
+++ b/eclipse-collabnet-merge.spec
@@ -1,12 +1,11 @@
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-collabnet-merge
-Version:   4.0.0
-Release:   4%{?dist}
+Version:   4.0.2
+Release:   1%{?dist}
 Summary:   CollabNet Merge Client for Subclipse
-Group:     Development/Tools
 License:   EPL
-URL:       http://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&freeformpage=Merge%20Client
+URL:       https://desktop-eclipse.open.collab.net/
 
 # source tarball and the script used to generate it from upstream's source control
 # script usage:
@@ -16,13 +15,10 @@ Source1:   get-collabnet-merge.sh
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 4.2.0-0.6
-BuildRequires: eclipse-subclipse >= 1.10.0
-Requires:      jpackage-utils
-Requires:      eclipse-platform >= 4.2.0-0.6
-Requires:      eclipse-subclipse >= 1.10.0
+BuildRequires: eclipse-pde >= 4.3.2
+BuildRequires: eclipse-subclipse >= 1.10.5
+Requires:      eclipse-platform >= 4.3.2
+Requires:      eclipse-subclipse >= 1.10.5
 
 %description
 The CollabNet Merge Client has been built on top of Eclipse and Subclipse.
@@ -41,17 +37,8 @@ development tool.
 %prep
 %setup -q -n collabnet-merge-%{version}
 
-# make sure upstream hasn't sneaked in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
-  if [ ! -L $j ]; then
-    JARS="$JARS $j"
-  fi
-done
-if [ ! -z "$JARS" ]; then
-   echo "These jars should be deleted and symlinked to system jars: $JARS"
-   exit 1
-fi
+find -name *.class -delete
+find -name *.jar -delete
 
 %build
 # build collabnet-merge features
@@ -67,6 +54,10 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/collabnet-merge build/rpmBuild/com.
 %doc com.collabnet.subversion.merge.feature/license.html
 
 %changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 4.0.2-1
+- Update to latest upstream release
+- Update project URL
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/get-collabnet-merge.sh b/get-collabnet-merge.sh
index 90c702d..213e69c 100644
--- a/get-collabnet-merge.sh
+++ b/get-collabnet-merge.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 NAME="collabnet-merge"
-VERSION=4.0.0
+VERSION=4.0.2
 
 echo "Exporting from Source Control..."
 rm -rf $NAME-$VERSION
@@ -8,8 +8,8 @@ mkdir $NAME-$VERSION
 pushd $NAME-$VERSION >/dev/null
 
 # if prompted for a password, just hit return; the password is blank
-svn export -r3104 http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/trunk/features/com.collabnet.subversion.merge.feature --username guest
-svn export -r3104 http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/trunk/plugins/com.collabnet.subversion.merge --username guest
+svn export -r3356 http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/trunk/features/com.collabnet.subversion.merge.feature --username guest
+svn export -r3356 http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/trunk/plugins/com.collabnet.subversion.merge --username guest
 
 popd >/dev/null
 
diff --git a/sources b/sources
index c9a35c9..225db0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39e5daf9f7a770ebbb0ceb07199a0838  collabnet-merge-4.0.0.tar.gz
+8df48cdd3e20fda52699cafb45488aa2  collabnet-merge-4.0.2.tar.gz