[eclipse-ecf/f19] Update to latest upstream.

Krzysztof Daniel kdaniel at fedoraproject.org
Thu Sep 26 17:56:09 UTC 2013


commit 7e62e81d70af9d600bcfe5bac018d8a0a5b306c8
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Sep 26 19:55:57 2013 +0200

    Update to latest upstream.

 .gitignore       |    1 +
 eclipse-ecf.spec |   12 +++++++++---
 sources          |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75b537b..b796a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ R-Release_HEAD-sdk_feature-77_2012-06-10_19-42-02.tar.bz2
 /results_eclipse-ecf
 /org.eclipse.ecf-R-Release_HEAD-sdk_feature-104_2013-05-01_11-47-00.tar.bz2
 /org.eclipse.ecf-R-Release_HEAD-sdk_feature-104_2013-05-01_11-47-00
+/org.eclipse.ecf-R-Release_HEAD-sdk_feature-113_2013-06-05_17-43-35.tar.bz2
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 75ac20e..48ceaa3 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -1,13 +1,13 @@
 %{?scl:%scl_package eclipse-ecf}
 %{!?scl:%global pkg_name %{name}}
 
-%global tag 	R-Release_HEAD-sdk_feature-104_2013-05-01_11-47-00
-%global contextQualifier 201303090712
+%global tag 	R-Release_HEAD-sdk_feature-113_2013-06-05_17-43-35
+%global contextQualifier v20130605-1748
 
 %define __requires_exclude osgi*
 
 Name:           %{?scl_prefix}eclipse-ecf
-Version:        3.6.0
+Version:        3.6.1
 Release:        1%{?dist}
 Summary:        Eclipse Communication Framework
 
@@ -75,6 +75,9 @@ popd
 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
 sed -i -e 's#;bundle-version="1.1.1"##g' ecf/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
 sed -i -e 's#1.1.1#0.0.0#g' ecf/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 
+sed -i -e 's#(Object) ((URIID) o)#((URIID) o)#g' ecf/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java
+sed -i -e '10i#org.apache.commons.logging,' ecf/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
+sed -i -e '10i#org.apache.commons.logging,' ecf/plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
 
 %build
 eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
@@ -97,6 +100,9 @@ popd
 %doc ecf/features/org.eclipse.ecf.filetransfer.feature/about.html
 
 %changelog
+* Tue Sep 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.6.1-1
+- Update to latest upstream.
+
 * Wed May 1 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.6.0-1
 - Update to latest upstream.
 
diff --git a/sources b/sources
index a11cb83..ed23d22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2beae5b224bbf40c4341d8ee18b92db0  org.eclipse.ecf-R-Release_HEAD-sdk_feature-104_2013-05-01_11-47-00.tar.bz2
+0f4e7bd7722484aca6d8dd502069d322  org.eclipse.ecf-R-Release_HEAD-sdk_feature-113_2013-06-05_17-43-35.tar.bz2


More information about the scm-commits mailing list