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

[Krzysztof Daniel]

commit ef2ee7acd65a2919186efc3628d1a857674cd04d
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Apr 2 21:10:53 2012 +0200

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

 .gitignore       |    4 ++-
 eclipse-emf.spec |   66 ++++++++++++++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f25486f..fa8e5b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ emf-2.6.1.tar.gz
 /emf-2.7.1.tar.gz
 /emf-2.8.0.tar.gz
 *.rpm
-.project
\ No newline at end of file
+.project
+/emf-2.8.0
+/noarch
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index fdc0b4d..cc274b9 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -6,7 +6,7 @@
 
 Name:      eclipse-emf
 Version:   2.8.0
-Release:   0.2.postM6%{?dist}
+Release:   0.2.postM6%{?dist}.1
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -31,17 +31,15 @@ Patch4:    %{name}-no-xsd2ecore.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#%if 0%{?rhel} >= 6
-#ExclusiveArch:    %{ix86} x86_64
-#%else
-#BuildArch:        noarch
-#%endif
+%if 0%{?rhel} >= 6
+ExclusiveArch:    %{ix86} x86_64
+%endif
 
 # we require 1.6.0 because the javadocs fail to build otherwise
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    java-javadoc
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde%{?_isa} >= 1:3.6.1
+BuildRequires:    eclipse-pde >= 1:3.8.0-0.21
 BuildRequires:    dos2unix
 Requires:         java
 Requires:         jpackage-utils
@@ -157,39 +155,39 @@ 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"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.converter -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.edit -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.common.ui -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.edit.ui -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.ecore.edit -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.ecore.editor -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.codegen -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.mapping -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ui -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.codegen.ecore.ui -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ui -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.mapping.ecore.editor -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.databinding -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.databinding.edit -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.converter -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.sdk -a "$OPTIONS"
 
 # build xsd features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.edit -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.editor -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.mapping -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.mapping.editor -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.ecore.converter -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.xsd.sdk -a "$OPTIONS"
 
 # build examples features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.emf.examples -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.emf.examples -a "$OPTIONS"
 
 %install
 rm -rf %{buildroot}