rpms/eclipse-mylyn/devel eclipse-mylyn.spec, 1.40, 1.41 eclipse-mylyn-wikitext_builddoc.patch, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18942/devel

Modified Files:
	eclipse-mylyn.spec eclipse-mylyn-wikitext_builddoc.patch 
Log Message:
Add patch for correct building of o.e.wikitext.help.ui.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- eclipse-mylyn.spec	4 Aug 2009 13:46:22 -0000	1.40
+++ eclipse-mylyn.spec	22 Sep 2009 11:29:18 -0000	1.41
@@ -11,7 +11,7 @@
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -33,6 +33,7 @@ Patch7: %{name}-nojaxb.patch
 # Our xmlrpc packages are split into JARs differently than Orbit
 # This patch is not suitable for upstream.
 Patch8: %{name}-splitxmlrpc.patch
+Patch9: %{name}-wikitext_builddoc.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -169,6 +170,7 @@ pushd org.eclipse.mylyn.bugzilla-feature
 popd
 %patch7
 %patch8
+%patch9
 
 find -name feature.xml |
   while read f; do
@@ -327,6 +329,9 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-2
+- Add patch for correct building of o.e.wikitext.help.ui.
+
 * Tue Aug 4 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-1
 - Update to 3.2.1.
 

eclipse-mylyn-wikitext_builddoc.patch:
 MANIFEST.MF |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: eclipse-mylyn-wikitext_builddoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-wikitext_builddoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-mylyn-wikitext_builddoc.patch	25 Mar 2009 13:36:03 -0000	1.1
+++ eclipse-mylyn-wikitext_builddoc.patch	22 Sep 2009 11:29:18 -0000	1.2
@@ -1,10 +1,11 @@
---- org.eclipse.mylyn.wikitext.ui/META-INF/MANIFEST.MF.orig	2009-03-25 14:04:18.000000000 +0100
-+++ org.eclipse.mylyn.wikitext.ui/META-INF/MANIFEST.MF	2009-03-25 14:05:24.000000000 +0100
-@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.w
- Bundle-Version: 1.0.0.qualifier
+--- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.sav	2009-06-27 23:09:32.000000000 +0300
++++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF	2009-09-22 14:07:05.676264614 +0300
+@@ -6,5 +6,7 @@ Bundle-Version: 1.1.1.qualifier
  Bundle-Vendor: %Bundle-Vendor.0
- Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.0.0,1.1.0)",
-+ org.eclipse.mylyn.wikitext.textile.core;bundle-version="[1.0.0,1.1.0)",
-  org.eclipse.core.runtime,
-  org.eclipse.jface.text,
-  org.eclipse.ui,
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+-Require-Bundle: org.eclipse.help
++Require-Bundle: org.eclipse.help,
++      org.eclipse.mylyn.wikitext.core,
++      org.eclipse.mylyn.wikitext.textile.core
+ Bundle-Localization: plugin