[eclipse-emf] 809154: Make emf to be built with eclipse-pdebuild script https://bugzilla.redhat.com/show_bug.cgi?i

[Krzysztof Daniel]

commit fe9d7b96108e6782820fbe43509dfdcbdd7d5370
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Apr 2 18:04:35 2012 +0200

    809154: Make emf to be built with eclipse-pdebuild script
    https://bugzilla.redhat.com/show_bug.cgi?id=809154

 eclipse-emf.spec |   64 +++++++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 31 deletions(-)
---
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 553852b..0e0fe6b 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -1,12 +1,11 @@
 %if 0%{?rhel} >= 6
 %global debug_package %{nil}
 %endif
-%global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-emf
 Version:   2.8.0
-Release:   0.3.postM6%{?dist}
+Release:   0.4.postM6%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -41,7 +40,7 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.6.1
+BuildRequires:    eclipse-pde >= 1:4.2.0-0.4
 BuildRequires:    dos2unix
 BuildRequires:    eclipse-emf-core >= 2.8
 Requires:         java
@@ -166,44 +165,44 @@ ln -s %{_builddir}/emf-%{version}/org.eclipse.xsd.license-feature %{_builddir}/e
 # maintain (i.e. we don't have to know when upstream adds a new plugin)
 
 # build core features
-#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
-#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
+#eclipse-pdebuild -f org.eclipse.emf.common -a "$OPTIONS"
+#eclipse-pdebuild -f org.eclipse.emf.ecore -a "$OPTIONS"
 
 # build emf features - order is important
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS" -d "eclipse-emf-core"
 
 # build xsd features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS" -d "eclipse-emf-core"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS" -d "eclipse-emf-core"
 
 # build examples features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
+eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS" -d "eclipse-emf-core"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
-install -d -m 755 %{buildroot}%{eclipse_base}
+#install -d -m 755 %{buildroot}%{eclipse_base}
 #unzip -q -n -d %{buildroot}%{_libdir}                     build/rpmBuild/org.eclipse.emf.common.zip
 #unzip -q -n -d %{buildroot}%{_libdir}                     build/rpmBuild/org.eclipse.emf.ecore.zip
  
@@ -267,6 +266,9 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Mon Apr 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.4.postM6
+- Use %{bindir}/eclipse-pdebuild.
+
 * Thu Mar 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.8.0-0.3.postM6
 - Back noarch.
 - Use the eclipse-emf-core from main eclipse-emf.