From 4388a1f65b91729c4003b7fb6d12b11f008d0bc8 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Oct 22 2008 21:33:25 +0000
Subject: - BR ws-jaxme.

- Bump xmlrpc3 requires for proper OSGi metadata.
- Fix trac feature.xml to not require different qualifier for the deps.

---

diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 72b0730..7962d96 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -7,7 +7,7 @@
 Name: eclipse-mylyn 
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.0.3
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -41,8 +41,9 @@ BuildRequires: jakarta-commons-httpclient >= 1:3.1-0.3
 BuildRequires: jakarta-commons-logging >= 1.0.4-7.7
 BuildRequires: jakarta-commons-lang >= 2.3-2.3
 BuildRequires: ws-commons-util >= 1.0.1-5
-BuildRequires: xmlrpc3-client >= 3.0-1jpp.3
-BuildRequires: xmlrpc3-common >= 3.0-1jpp.3
+BuildRequires: xmlrpc3-client >= 3.0-2.8
+BuildRequires: xmlrpc3-common >= 3.0-2.8
+BuildRequires: ws-jaxme >= 0.5.1-2.4
 BuildRequires: rome
 BuildRequires: jdom >= 1.0-5.5
 Requires: eclipse-platform >= 1:3.4.0
@@ -52,8 +53,9 @@ Requires: jakarta-commons-httpclient >= 1:3.1-0.3
 Requires: jakarta-commons-logging >= 1.0.4-7.7
 Requires: jakarta-commons-lang >= 2.3-2.3
 Requires: ws-commons-util >= 1.0.1-5
-Requires: xmlrpc3-client >= 3.0-1jpp.3
-Requires: xmlrpc3-common >= 3.0-1jpp.3
+Requires: xmlrpc3-client >= 3.0-2.8
+Requires: xmlrpc3-common >= 3.0-2.8
+Requires: ws-jaxme >= 0.5.1-2.4
 Provides: eclipse-mylar = 2.0.0-1.fc7
 Obsoletes: eclipse-mylar < 2.0.0
 Provides: eclipse-mylyn-ide = %{version}-%{release}
@@ -133,6 +135,7 @@ ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v2008053
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
 ln -s %{_javadir}/jdom-1.0.jar org.jdom_1.0.0.v200806100616.jar
 ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar
+ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar
 popd
 
 #javax.activation_1.1.0.v200806101325.jar
@@ -242,6 +245,17 @@ rm org.apache.xmlrpc_3.0.0.%{qualifier}.jar
 ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
+ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar
+popd
+
+#Do not use qualifier value for dependencies to not be forced to rebuild them for 
+# every mylyn
+pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/features
+	find -name feature.xml |
+	while read f; do
+      sed -i "s/3.0.0.%{qualifier}/3.0.0.qualifier/g" $f
+      sed -i "s/1.0.0.%{qualifier}/1.0.0.qualifier/g" $f
+  	done
 popd
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks/eclipse/plugins
@@ -296,6 +310,11 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Oct 21 2008 Alexander Kurtakov <akurtako@redhat.com> 3.0.3-2
+- BR ws-jaxme.
+- Bump xmlrpc3 requires for proper OSGi metadata.
+- Fix trac feature.xml to not require different qualifier for the deps.
+
 * Tue Oct 21 2008 Alexander Kurtakov <akurtako@redhat.com> 3.0.3-1
 - 3.0.3.
 - Rebase addfedoracustomizations.patch.