[eclipse-ecf] - Don't duplicate org.apache* plugins - Use context qualifier to avoid constant feature version chan

[Krzysztof Daniel]

commit 091ceb52b6c6c91ea7f732b61c23c1b00c8901e8
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Aug 27 14:23:47 2012 +0200

    - Don't duplicate org.apache* plugins
    - Use context qualifier to avoid constant feature version changes.

 .gitignore       |    4 ++++
 eclipse-ecf.spec |   18 ++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93fe978..ddd3a14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 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
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 74dda20..ea0033e 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -1,8 +1,8 @@
 %global tag R-Release_HEAD-sdk_feature-77_2012-06-10_19-42-02
-
+%global contextQualifier 201208090744
 Name:           eclipse-ecf
 Version:        3.5.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Eclipse Communication Framework
 
 License:        EPL
@@ -54,8 +54,8 @@ rm -rf `ls | grep -v "ecf"`
 find . -type f -name "*.jar" -exec rm {} \;
 
 %build
-eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature
-eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient.feature
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature -j "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient.feature -j "-DforceContextQualifier=%{contextQualifier}"
 
 
 %install
@@ -64,12 +64,22 @@ 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
 
+pushd %{buildroot}%{_javadir}/ecf/eclipse/plugins/
+rm -rf org.apache*
+ln -s %{_javadir}/commons-codec.jar
+ln -s %{_javadir}/commons-httpclient.jar
+ln -s %{_javadir}/commons-logging.jar
+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
 
 %changelog
+* Mon Aug 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.5.6-3
+- Don't duplicate org.apache* plugins
+- Use context qualifier to avoid constant feature version changes.
+
 * Wed Aug 8 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.5.6-2
 - Review issues fixed.