[eclipse-emf/f17] Bugs 812870, 812872 - fix building index for documentation.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Apr 16 13:21:36 UTC 2012
commit 739efb22b0b0393e4acb0fca4fe6237638217250
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Apr 16 15:19:24 2012 +0200
Bugs 812870, 812872 - fix building index for documentation.
eclipse-emf-fix-missing-index.patch | 40 +++++++++++++++++++++++++++++++++++
eclipse-emf.spec | 8 +++++-
2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-emf-fix-missing-index.patch b/eclipse-emf-fix-missing-index.patch
new file mode 100644
index 0000000..5e27d1c
--- /dev/null
+++ b/eclipse-emf-fix-missing-index.patch
@@ -0,0 +1,40 @@
+--- org.eclipse.emf.doc/build.properties.bak 2012-03-29 09:25:16.000000000 +0200
++++ org.eclipse.emf.doc/build.properties 2012-04-16 09:41:01.884130200 +0200
+@@ -25,4 +25,5 @@
+ modeling32.png,\
+ plugin.properties,\
+ plugin.xml,\
+- toc.xml
++ toc.xml, \
++ index/
+--- org.eclipse.emf.doc/customBuildCallbacks.xml.bak 2012-03-29 09:25:16.000000000 +0200
++++ org.eclipse.emf.doc/customBuildCallbacks.xml 2012-04-16 14:33:51.571719004 +0200
+@@ -26,7 +26,7 @@
+ <!-- ===================================================================== -->
+ <target name="post.build.jars">
+ <!-- TODO: tweak buildDoc.xml as required (copied from ve.doc plugin) -->
+- <!-- <ant antfile="buildDoc.xml" /> -->
++ <ant antfile="buildDoc.xml" />
+ </target>
+
+ <!-- ===================================================================== -->
+--- org.eclipse.xsd.doc/customBuildCallbacks.xml.bak 2012-03-29 09:25:16.000000000 +0200
++++ org.eclipse.xsd.doc/customBuildCallbacks.xml 2012-04-16 15:12:43.806003835 +0200
+@@ -26,7 +26,7 @@
+ <!-- ===================================================================== -->
+ <target name="post.build.jars">
+ <!-- TODO: tweak buildDoc.xml as required (copied from ve.doc plugin) -->
+- <!-- <ant antfile="buildDoc.xml" /> -->
++ <ant antfile="buildDoc.xml" />
+ </target>
+
+ <!-- ===================================================================== -->
+--- org.eclipse.xsd.doc/build.properties.bak 2012-03-29 09:25:24.000000000 +0200
++++ org.eclipse.xsd.doc/build.properties 2012-04-16 15:12:30.059943214 +0200
+@@ -25,4 +25,5 @@
+ modeling32.png,\
+ plugin.xml,\
+ plugin.properties,\
+- toc.xml
++ toc.xml,\
++ index/
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index dd05778..dfea857 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -5,7 +5,7 @@
Name: eclipse-emf
Version: 2.8.0
-Release: 0.5.postM6%{?dist}
+Release: 0.6.postM6%{?dist}
Summary: Eclipse Modeling Framework (EMF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -27,7 +27,7 @@ Patch2: %{name}-bundle-examples.patch
Patch3: %{name}-build-docs.patch
# Remove xsd2ecore components from SDK, they are not in the main feature
Patch4: %{name}-no-xsd2ecore.patch
-
+Patch5: %{name}-fix-missing-index.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} >= 6
@@ -124,6 +124,7 @@ plugins.
%patch2 -p1 -b .orig
%patch3 -p1 -b .orig
%patch4 -p1 -b .orig
+%patch5
rm org.eclipse.emf.doc/tutorials/jet2/jetc-task.jar
rm org.eclipse.emf.test.core/data/data.jar
@@ -271,6 +272,9 @@ rm -rf %{buildroot}%{eclipse_dropin}/emf{,-sdk}/eclipse/plugins/org.eclipse.emf.
%{eclipse_dropin}/emf-examples
%changelog
+* Mon Apr 16 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.6.postM6
+- Bugs 812870, 812872 - fix building index for documentation.
+
* Tue Apr 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.5.postM6
- Remove %clean section.
- Remove duplicated plugins.
More information about the scm-commits
mailing list