[eclipse-ecf/f19] - Drop v3 httpclient. - Make dependency to commons loggigng less strict.

[Krzysztof Daniel]

commit b895f6b606086395b9f49e79ca4cd83240b8bdd9
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Apr 8 16:35:47 2013 +0200

    - Drop v3 httpclient.
    - Make dependency to commons loggigng less strict.

 eclipse-ecf.spec |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 92ba181..a7be088 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -8,7 +8,7 @@
 
 Name:           %{?scl_prefix}eclipse-ecf
 Version:        3.5.7
-Release:        0.4%{?dist}
+Release:        0.5%{?dist}
 Summary:        Eclipse Communication Framework
 
 License:        EPL
@@ -22,6 +22,7 @@ BuildRequires:  eclipse-pde >= 4.2.0-5
 BuildRequires:	httpcomponents-client
 BuildRequires:	httpcomponents-core
 BuildRequires:	jakarta-commons-httpclient
+BuildRequires:	apache-commons-logging
 
 BuildArch:      noarch
 
@@ -49,19 +50,15 @@ ECF bundles required by eclipse-platform.
 mkdir -p ecf/plugins
 mkdir -p ecf/features
 
-cp -r releng/features/org.eclipse.ecf.filetransfer{,.httpclient,.httpclient4}.feature \
+cp -r releng/features/org.eclipse.ecf.filetransfer{,.httpclient4}.feature \
     ecf/features
 
-#cp -r org.eclipse.ecf.filetransfer.httpclient4.feature ecf/features
-
 cp -r framework/bundles/org.eclipse.ecf ecf/plugins
 cp -r framework/bundles/org.eclipse.ecf.identity ecf/plugins
 cp -r framework/bundles/org.eclipse.ecf.ssl ecf/plugins
 cp -r framework/bundles/org.eclipse.ecf.filetransfer ecf/plugins
 cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer ecf/plugins
 cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl ecf/plugins
-cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient ecf/plugins
-cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl ecf/plugins
 cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4 ecf/plugins
 cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl ecf/plugins
 
@@ -77,10 +74,11 @@ pushd deps
 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 
 
 %build
 eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient.feature -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
 eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps 
 
 
@@ -88,7 +86,6 @@ eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature -j "-Dforce
 install -d -m 755 %{buildroot}%{_javadir}/ecf
 
 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.httpclient.feature.zip
 unzip -q -n -d %{buildroot}%{_javadir}/ecf          build/rpmBuild/org.eclipse.ecf.filetransfer.httpclient4.feature.zip
 
 pushd %{buildroot}%{_javadir}/ecf/eclipse/plugins/
@@ -101,6 +98,10 @@ popd
 %doc ecf/features/org.eclipse.ecf.filetransfer.feature/about.html
 
 %changelog
+* Mon Apr 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.5.7-0.5
+- Drop v3 httpclient.
+- Make dependency to commons loggigng less strict.
+
 * Wed Mar 20 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.5.7-0.4
 - Add direct dependency to jakarta-commons-httpclient.