[eclipse-gef/f17] Update to Eclipse 4.2 and fix documentation

[Krzysztof Daniel]

commit f0fab456d93fbb017d4e9512726e2c2ee5171740
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Apr 13 16:05:17 2012 +0200

    Update to Eclipse 4.2 and fix documentation

 eclipse-gef-fix-doc.patch |   19 +++++++++++++++++++
 eclipse-gef.spec          |   32 +++++++++++++++-----------------
 2 files changed, 34 insertions(+), 17 deletions(-)
---
diff --git a/eclipse-gef-fix-doc.patch b/eclipse-gef-fix-doc.patch
new file mode 100644
index 0000000..05688ab
--- /dev/null
+++ b/eclipse-gef-fix-doc.patch
@@ -0,0 +1,19 @@
+--- org.eclipse.gef.doc.isv/build.properties.bak	2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.gef.doc.isv/build.properties	2012-04-13 15:51:54.566043153 +0200
+@@ -19,5 +19,6 @@
+                topics_Guide.xml,\
+                topics_Reference.xml,\
+                topics_Samples.xml,\
+-               plugin.properties
++               plugin.properties,\
++               META-INF/
+ 
+--- org.eclipse.draw2d.doc.isv/build.properties.bak	2012-04-02 15:18:50.000000000 +0200
++++ org.eclipse.draw2d.doc.isv/build.properties	2012-04-13 16:04:47.464646302 +0200
+@@ -15,4 +15,5 @@
+                plugin.properties,\
+                reference/,\
+                topics_Guide.xml,\
+-               topics_Reference.xml
++               topics_Reference.xml,\
++               META-INF/
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index e51f03b..d9a8116 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -1,10 +1,9 @@
-%global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-gef
 Version:   3.8.0
 #no tag in the repository, HEAD checked out
-Release:   0.1.20120402%{?dist}
+Release:   0.2.20120402%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -21,18 +20,17 @@ Patch1:   %{name}-generateSourceForGefFeature.patch
 Patch2:   %{name}-generateSourceForZestFeature.patch
 Patch3:   %{name}-removeExamplesSourceSelfContainment.patch
 Patch4:   %{name}-generateSourceForExamples.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch5:   %{name}-fix-doc.patch
 
 BuildArch:        noarch
 
-BuildRequires:    java-devel
+BuildRequires:    java-devel >= 1.7.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.8.0-0.21
-Requires:         java
+BuildRequires:    eclipse-pde >= 1:4.2.0-0.6
+Requires:         java >= 1.7.0
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.8.0
+Requires:         eclipse-platform >= 1:4.2.0-0.6
 
 %description
 The Graphical Editing Framework (GEF) allows developers to create a rich
@@ -45,7 +43,7 @@ class diagram editors, state machines, and even WYSIWYG text editors.
 Summary:   Eclipse GEF SDK
 Group:     System Environment/Libraries
 Requires:  java-javadoc
-Requires:  eclipse-pde >= 1:3.8.0
+Requires:  eclipse-pde >= 1:4.2.0-0.6
 Requires:  %{name} = %{version}-%{release}
 
 %description sdk
@@ -67,7 +65,7 @@ to use the Eclipse Graphical Editing Framework (GEF) plugin.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5
 # make sure upstream hasn't snuck in any jars we don't know about
 JARS=""
 for j in `find -name "*.jar"`; do
@@ -92,16 +90,14 @@ OPTIONS="-DforceContextQualifier=v20110622-0958"
 # build gef features
 eclipse-pdebuild -f org.eclipse.gef -a "$OPTIONS"
 eclipse-pdebuild -f org.eclipse.zest -a " $OPTIONS "
-eclipse-pdebuild -f org.eclipse.gef.sdk \
-  -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin"
-eclipse-pdebuild -f org.eclipse.zest.sdk \
-  -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin -DindividualSourceBundles=true"
+eclipse-pdebuild -f org.eclipse.gef.sdk -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin"
+eclipse-pdebuild -f org.eclipse.zest.sdk -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin -DindividualSourceBundles=true"
 
 # build examples features
 eclipse-pdebuild -f org.eclipse.gef.examples -a "-DindividualSourceBundles=true"
 
 %install
-rm -rf %{buildroot}
+
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef          build/rpmBuild/org.eclipse.gef.zip
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef          build/rpmBuild/org.eclipse.zest.zip
@@ -113,8 +109,6 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-examples build/rpmBuild/org.ecl
 (cd %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/gef/eclipse/features | xargs rm -rf)
 (cd %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins  && ls %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins  | xargs rm -rf)
 
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -135,6 +129,10 @@ rm -rf %{buildroot}
 %doc org.eclipse.gef.examples-feature/epl-v10.html
 
 %changelog
+* Fri Apr 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.2.20120402
+- Update to Eclipse 4.2
+- Fix documentation build
+
 * Mon Apr 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.1.20120402
 - Update to 3.8.0 post M6 build.