[eclipse-ecf/f20] Update to latest upstream.
mbooth
mbooth at fedoraproject.org
Thu Mar 20 11:23:17 UTC 2014
commit 5258e5c771faec4edd25b77ce95c82663bb0698c
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Thu Mar 20 10:47:52 2014 +0000
Update to latest upstream.
- Now necessary to explicitly build more fine-grained features.
- Drop unneeded dep on jakarta-commons-httpclient.
- Fixed mixed use of tabs and spaces.
- Switch core package to R: java-headless, rhbz #1068037
.gitignore | 4 +-
eclipse-ecf-no-apache-source.patch | 35 ++++++++++++++
eclipse-ecf.spec | 87 +++++++++++++++++++++++------------
sources | 2 +-
4 files changed, 95 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b796a42..428a08b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
-R-Release_HEAD-sdk_feature-77_2012-06-10_19-42-02.tar.bz2
-/R-Release_HEAD-sdk_feature-77_2012-06-10_19-42-02
/noarch
/.gitignore
*.rpm
/.project
+/.build-*.log
/R-Release_HEAD-sdk_feature-93_2013-03-09_07-11-52.tar.bz2
/R-Release_HEAD-sdk_feature-93_2013-03-09_07-11-52
/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
+/org.eclipse.ecf-R-Release_HEAD-sdk_feature-131_2014-03-09_07-38-03.tar.bz2
diff --git a/eclipse-ecf-no-apache-source.patch b/eclipse-ecf-no-apache-source.patch
new file mode 100644
index 0000000..517adf4
--- /dev/null
+++ b/eclipse-ecf-no-apache-source.patch
@@ -0,0 +1,35 @@
+--- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig 2014-03-19 15:40:59.856504656 +0000
++++ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 2014-03-19 15:41:23.653503134 +0000
+@@ -62,32 +62,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.apache.commons.codec.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.logging.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.httpcomponents.httpclient.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.httpcomponents.httpcore.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ </feature>
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 2d3d7a5..97d9f6c 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -1,40 +1,43 @@
%{?scl:%scl_package eclipse-ecf}
%{!?scl:%global pkg_name %{name}}
-%global tag R-Release_HEAD-sdk_feature-113_2013-06-05_17-43-35
-%global contextQualifier v20130605-1748
+%global tag R-Release_HEAD-sdk_feature-131_2014-03-09_07-38-03
+%global contextQualifier v20140309-0741
%define __requires_exclude osgi*
Name: %{?scl_prefix}eclipse-ecf
-Version: 3.6.1
+Version: 3.8.0
Release: 1%{?dist}
-Summary: Eclipse Communication Framework
+Summary: Eclipse Communication Framework (ECF)
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.2.0-5
-BuildRequires: httpcomponents-client
-BuildRequires: httpcomponents-core
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: apache-commons-logging
+BuildRequires: eclipse-pde >= 4.3.0
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
+BuildRequires: apache-commons-codec
+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.
+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.
%package core
Summary: ECF core bundles
Group: System Environment/Libraries
-Requires: java >= 1:1.7.0
+Requires: java-headless
Requires: jpackage-utils
%{?scl:Requires: %scl_runtime}
@@ -44,11 +47,17 @@ 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
-cp -r releng/features/org.eclipse.ecf.filetransfer{,.httpclient4}.feature \
+cp -r releng/features/org.eclipse.ecf.core.{,ssl.}feature \
+ ecf/features
+cp -r releng/features/org.eclipse.ecf.filetransfer.httpclient4.{,ssl.}feature \
+ ecf/features
+cp -r releng/features/org.eclipse.ecf.filetransfer.{,ssl.}feature \
ecf/features
cp -r framework/bundles/org.eclipse.ecf ecf/plugins
@@ -63,55 +72,73 @@ cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl ec
rm -rf `ls | grep -v "ecf"`
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-httpclient.jar
- ln -s /usr/share/java/commons-logging.jar
+ 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
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
-eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-
+eclipse-pdebuild -f org.eclipse.ecf.core.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+eclipse-pdebuild -f org.eclipse.ecf.core.ssl.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.ssl.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.ssl.feature \
+ -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
%install
install -d -m 755 %{buildroot}%{_javadir}/ecf
+unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.core.feature.zip
+unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.core.ssl.feature.zip
unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.filetransfer.feature.zip
+unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.filetransfer.ssl.feature.zip
unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.filetransfer.httpclient4.feature.zip
+unzip -q -n -d %{buildroot}%{_javadir}/ecf build/rpmBuild/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.zip
pushd %{buildroot}%{_javadir}/ecf/eclipse/plugins/
rm -rf org.apache*
#remove timestamps from name to make symlinking easy
for f in \
+org.eclipse.ecf \
org.eclipse.ecf.filetransfer \
org.eclipse.ecf.identity \
-org.eclipse.ecf.provider.filetransfer.httpclient4.ssl \
-org.eclipse.ecf.provider.filetransfer.httpclient4 \
-org.eclipse.ecf.provider.filetransfer.ssl \
org.eclipse.ecf.provider.filetransfer \
+org.eclipse.ecf.provider.filetransfer.ssl \
org.eclipse.ecf.ssl \
-org.eclipse.ecf ; do \
- mv ${f}_*.jar ${f}.jar
+org.eclipse.ecf.provider.filetransfer.httpclient4 \
+org.eclipse.ecf.provider.filetransfer.httpclient4.ssl ; do
+ mv ${f}_*.jar ${f}.jar
done
popd
%files core
%{_javadir}/ecf
-%doc ecf/features/org.eclipse.ecf.filetransfer.feature/license.html
-%doc ecf/features/org.eclipse.ecf.filetransfer.feature/about.html
+%doc ecf/features/org.eclipse.ecf.core.feature/*.html
%changelog
+* Wed Mar 19 2014 Mat Booth <fedora at matbooth.co.uk> - 3.8.0-1
+- Update to latest upstream.
+- Now necessary to explicitly build more fine-grained features.
+- Drop unneeded dep on jakarta-commons-httpclient.
+- Fixed mixed use of tabs and spaces.
+- Switch core package to R: java-headless, rhbz #1068037
+
* Tue Sep 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.6.1-1
- Update to latest upstream.
diff --git a/sources b/sources
index ed23d22..959be41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f4e7bd7722484aca6d8dd502069d322 org.eclipse.ecf-R-Release_HEAD-sdk_feature-113_2013-06-05_17-43-35.tar.bz2
+2185bab868bad84328da14acb5f48764 org.eclipse.ecf-R-Release_HEAD-sdk_feature-131_2014-03-09_07-38-03.tar.bz2
More information about the scm-commits
mailing list