[eclipse-ecf/f21: 3/3] Update to latest upstream release

[Mat Booth]

commit 7a6f1be5952846c5661aa7150299a9d0829d8507
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Aug 19 11:44:49 2014 +0100

    Update to latest upstream release
    
    - Drop unneeded patch

 eclipse-ecf-no-apache-source.patch |   35 --------------------------------
 eclipse-ecf.spec                   |   39 ++++++++++++++---------------------
 sources                            |    2 +-
 3 files changed, 17 insertions(+), 59 deletions(-)
---
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 2fabc41..1929d38 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -1,23 +1,20 @@
 %{?scl:%scl_package eclipse-ecf}
 %{!?scl:%global pkg_name %{name}}
 
-%global tag R-Release_HEAD-sdk_feature-140_2014-05-28_16-20-10
-%global contextQualifier v20140528-1620
+%global tag R-Release_HEAD-sdk_feature-142_2014-08-18_17-43-32
+%global contextQualifier v20140818-1748
 
 %define __requires_exclude osgi*
 
 Name:           %{?scl_prefix}eclipse-ecf
-Version:        3.8.1
-Release:        3%{?dist}
-Summary:        Eclipse Communication Framework (ECF)
+Version:        3.9.0
+Release:        1%{?dist}
+Summary:        Eclipse Communication Framework (ECF) Eclipse plug-in
 
 License:        EPL
 URL:            http://www.eclipse.org/ecf/
 Source0:        http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{tag}.tar.bz2
 
-# no source plugins for third party libs
-Patch0:         %{pkg_name}-no-apache-source.patch
-
 BuildRequires:  java-devel >= 1.7.0 
 BuildRequires:  jpackage-utils
 BuildRequires:  eclipse-pde >= 4.3.0
@@ -29,14 +26,12 @@ BuildRequires:  apache-commons-logging
 BuildArch:      noarch
 
 %description
-ECF is a framework for building distributed servers, applications,
-and tools. It provides a modular implementation of the OSGi 4.2
-Remote Services standard, along with support for REST-based and
-SOAP-based remote services, and asynchronous messaging for remote services. 
+ECF is a set of frameworks for building communications into applications and
+services. It provides a lightweight, modular, transport-independent, fully
+compliant implementation of the OSGi Remote Services standard.
 
 %package core
-Summary:   ECF core bundles
-Group:     System Environment/Libraries
+Summary:        Eclipse ECF Core
 Requires:       java-headless
 Requires:       jpackage-utils
 %{?scl:Requires: %scl_runtime}
@@ -47,8 +42,6 @@ ECF bundles required by eclipse-platform.
 %prep
 %setup -q -n org.eclipse.ecf-%{tag}
 
-%patch0 -b .orig
-
 #get just the bits we need
 mkdir -p ecf/plugins
 mkdir -p ecf/features
@@ -75,14 +68,10 @@ find . -type f -name "*.jar" -exec rm {} \;
 find . -type f -name "*.class" -exec rm {} \;
 
 mkdir -p deps
-pushd deps
-  ln -s /usr/share/java/httpcomponents/httpclient.jar
-  ln -s /usr/share/java/httpcomponents/httpcore.jar
-  ln -s /usr/share/java/commons-codec.jar
-  ln -s /usr/share/java/commons-logging.jar
-popd
+build-jar-repository -s -p deps \
+  httpcomponents/httpclient httpcomponents/httpcore commons-codec commons-logging
 
-sed -i -e 's/4.1.0/[4.1.0,5.0.0)/g' ecf/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
+# Allow building on java > 1.4
 sed -i -e 's#(Object) ((URIID) o)#((URIID) o)#g' ecf/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java
 
 %build
@@ -130,6 +119,10 @@ popd
 %doc ecf/features/org.eclipse.ecf.core.feature/*.html
 
 %changelog
+* Tue Aug 19 2014 Mat Booth <mat.booth at redhat.com> - 3.9.0-1
+- Update to latest upstream release
+- Drop unneeded patch
+
 * Wed Aug 6 2014 Alexander Kurtakov <akurtako at redhat.com> 3.8.1-3
 - Rebuild against latest httpcomponents.
 
diff --git a/sources b/sources
index 3079be8..e838e53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8eae9627cb9825dcd637f9f1c433e887  org.eclipse.ecf-R-Release_HEAD-sdk_feature-140_2014-05-28_16-20-10.tar.bz2
+7b01e2daf8541629dc57d9bfe6cd58a7  org.eclipse.ecf-R-Release_HEAD-sdk_feature-142_2014-08-18_17-43-32.tar.bz2