[eclipse-mylyn-commons] Fixed apache import version.

[Krzysztof Daniel]

commit 00b2e8bf56476591909df8f12d8b659c2fb14fbc
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Mar 27 09:01:42 2012 +0200

    Fixed apache import version.

 ...e-mylyn-commons-fix-apache-import-version.patch |   30 ++++++++++++++++++++
 eclipse-mylyn-commons.spec                         |    9 +++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-mylyn-commons-fix-apache-import-version.patch b/eclipse-mylyn-commons-fix-apache-import-version.patch
new file mode 100644
index 0000000..275d589
--- /dev/null
+++ b/eclipse-mylyn-commons-fix-apache-import-version.patch
@@ -0,0 +1,30 @@
+--- org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF.bak	2012-03-19 19:16:34.000000000 +0100
++++ org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF	2012-03-27 08:43:19.429363262 +0200
+@@ -21,15 +21,15 @@
+  org.apache.http.protocol;version="4.1.4",
+  org.apache.http.util;version="4.1.4", 
+  org.apache.http.impl;version="4.1.4",
+- org.apache.http.auth;version="4.1.2",
+- org.apache.http.auth.params;version="4.1.2",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.client.params;version="4.1.2",
+- org.apache.http.client.protocol;version="4.1.2",
+- org.apache.http.conn;version="4.1.2",
+- org.apache.http.conn.params;version="4.1.2",
+- org.apache.http.conn.scheme;version="4.1.2",
+- org.apache.http.impl.auth;version="4.1.2",
+- org.apache.http.impl.conn.tsccm;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2"
++ org.apache.http.auth;version="4.1.3",
++ org.apache.http.auth.params;version="4.1.3",
++ org.apache.http.client;version="4.1.3",
++ org.apache.http.client.methods;version="4.1.3",
++ org.apache.http.client.params;version="4.1.3",
++ org.apache.http.client.protocol;version="4.1.3",
++ org.apache.http.conn;version="4.1.3",
++ org.apache.http.conn.params;version="4.1.3",
++ org.apache.http.conn.scheme;version="4.1.3",
++ org.apache.http.impl.auth;version="4.1.3",
++ org.apache.http.impl.conn.tsccm;version="4.1.3",
++ org.apache.http.impl.client;version="4.1.3"
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index cf16865..b73cf3c 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -8,7 +8,7 @@
 Name: eclipse-mylyn-commons
 Summary: Common libraries for Eclipse Mylyn
 Version: 3.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
@@ -38,6 +38,9 @@ Patch2: %{name}-netimport.patch
 Patch3: %{name}-coreimport.patch
 Patch4: %{name}-httpimport.patch
 
+# Imports must match available apache version.
+Patch5: %{name}-fix-apache-import-version.patch
+
 BuildRequires: java-devel >= 1.7.0
 BuildRequires: jpackage-utils
 BuildRequires: eclipse-pde >= 1:3.8.0-0.18
@@ -108,6 +111,7 @@ ls -1 | grep  'org.eclipse.mylyn.*.tests' | xargs rm -rf
 %patch2
 %patch3
 %patch4
+%patch5
 
 
 %build
@@ -221,6 +225,9 @@ popd
 %doc org.eclipse.mylyn.commons-feature/license.html
 
 %changelog
+* Tue Mar 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-6
+- Importing proper client version.
+
 * Mon Mar 26 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-5
 - Restored ExclusiveArch for RHEL.