[eclipse-dtp] Fix build after eclipse-emf-runtime split.

Wed Dec 3 09:14:33 UTC 2014

commit 939c53c4e41d2c7dcee42e3014b1c99ada3d140a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Dec 3 11:14:33 2014 +0200

    Fix build after eclipse-emf-runtime split.
    
    - Modernize package a bit.

 eclipse-dtp.spec |  138 ++++++------------------------------------------------
 1 files changed, 15 insertions(+), 123 deletions(-)
---

diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
index 9de6526..50c5a4a 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -6,7 +6,7 @@
 
 Name:      eclipse-dtp
 Version:   1.12.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -46,16 +46,11 @@ Patch7:    %{name}-remove-javaxxml.patch
 # port to a newer version of lucene
 Patch8:    %{name}-lucene4-port.patch 
 
-%if 0%{?rhel} >= 6
-ExclusiveArch: %{ix86} x86_64
-%else
 BuildArch:        noarch
-%endif 
 
 BuildRequires:    java-devel >= 1:1.7.0
-BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0-0.4
-BuildRequires:    eclipse-emf
+BuildRequires:    eclipse-emf-runtime
 BuildRequires:    eclipse-gef
 BuildRequires:    wsdl4j >= 1.5.2-6.6
 BuildRequires:    xerces-j2 >= 2.7.1-10.3
@@ -63,11 +58,10 @@ BuildRequires:    xml-commons-resolver >= 1.1-2.15
 BuildRequires:    xalan-j2 >= 2.7.0-7.5
 BuildRequires:    xml-commons-apis >= 1.3.04-1.4
 BuildRequires:    lpg-java-compat = 1.1.0
-BuildRequires:    lucene-core
+BuildRequires:    lucene
 BuildRequires:    lucene-analysis
 BuildRequires:    lucene-queryparser
 
-Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:4.2.0-0.4
 Requires:         eclipse-emf
 Requires:         eclipse-gef
@@ -77,7 +71,7 @@ Requires:         xml-commons-resolver >= 1.1-2.15
 Requires:         xalan-j2 >= 2.7.0-7.5
 Requires:         xml-commons-apis >= 1.3.04-1.4
 Requires:         lpg-java-compat = 1.1.0
-Requires:         lucene-core
+Requires:         lucene
 Requires:         lucene-analysis
 Requires:         lucene-queryparser
 
@@ -151,19 +145,19 @@ ln -s %{_javadir}/wsdl4j.jar javax.wsdl_1.5.1.jar
 popd
 
 %build
-OPTIONS="-DjavacTarget=1.6 -DjavacSource=1.6 -DforceContextQualifier=%{qualifier}"
+OPTIONS="-DjavacTarget=1.7 -DjavacSource=1.7 -DforceContextQualifier=%{qualifier}"
 
 # build all features except for SDK features TODO: build everything
 eclipse-pdebuild -f org.eclipse.datatools.modelbase.feature \
-  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+  -d "emf-runtime gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 eclipse-pdebuild -f org.eclipse.datatools.connectivity.feature \
-  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+  -d "emf-runtime gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 eclipse-pdebuild -f org.eclipse.datatools.sqldevtools.feature \
-  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+  -d "emf-runtime gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 eclipse-pdebuild -f org.eclipse.datatools.enablement.feature \
-  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+  -d "emf-runtime gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 eclipse-pdebuild -f org.eclipse.datatools.doc.user \
-  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+  -d "emf-runtime gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 
 %install
 install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -200,6 +194,10 @@ popd
 %doc org.eclipse.datatools.build-%{tag}/features/org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Wed Dec 3 2014 Alexander Kurtakov <akurtako at redhat.com> 1.12.0-2
+- Fix build after eclipse-emf-runtime split.
+- Modernize package a bit.
+
 * Wed Aug 13 2014 Mat Booth <mat.booth at redhat.com> - 1.12.0-1
 - Update to upstream Luna release
 
@@ -233,110 +231,4 @@ popd
 
 * Thu Feb 21 2013 Alexander Kurtakov <akurtako at redhat.com> 1.10.1-4
 - Remove leftovers from old rpm.
-- Fix too strict lucene.core scriptlet.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Nov 22 2012 Krzysztof Daniel <kdaniel at redhat.com> 1.10.1-2
-- Remove javax.xml.
-
-* Thu Oct 4 2012 Krzysztof Daniel <kdaniel at redhat.com> 1.10.1-1
-- Update to 1.10.1
-
-* Thu Jul 26 2012 Sami Wagiaalla <swagiaal at redhat.com> 1.10-2
-- Remove copied lucene jar.
-
-* Tue Jul 17 2012 Sami Wagiaalla <swagiaal at redhat.com> 1.10-1
-- Update to 1.10.
-- Port dtp to lucene 3.5.
-
-* Mon Apr 9 2012 Andrew Overholt <overholt at redhat.com> 1.10-0.1.M6
-- Update to 1.10 M6.
-
-* Fri Dec 2 2011 Andrew Overholt <overholt at redhat.com> 1.9.1-3
-- Fix ExclusiveArch/noarch.
-
-* Fri Dec 2 2011 Andrew Overholt <overholt at redhat.com> 1.9.1-2
-- Update patch to build against Java 7 SQL interfaces.
-- Bump Java build and runtime requirements accordingly.
-
-* Wed Nov 30 2011 Andrew Overholt <overholt at redhat.com> 1.9.1-1
-- Update to 1.9.1.
-
-* Mon Nov 28 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-3
-- Add ExclusiveArch for RHEL.
-- Use lucene.core instead of plain lucene.
-
-* Mon Jul 11 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-2
-- Add patches to compile against newer lucene.
-
-* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-1
-- Update to 1.9.0.
-
-* Fri Mar 18 2011 Mat Booth <fedora at matbooth.co.uk> 1.8.2-1
-- Update to 1.8.2.
-
-* Thu Feb 10 2011 Alexander Kurtakov <akurtako at redhat.com> 1.8.1-3
-- Fix build with xerces 2.11.0.
-- Update qualifier to the recent one.
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Nov 23 2010 Chris Aniszczyk <zx at redhat.com> 1.8.1-1
-- Update to 1.8.1 (Helios SR1).
-
-* Tue Jul 20 2010 Andrew Overholt <overholt at redhat.com> 1.8.0-1
-- Update to 1.8.0 (Helios).
-- Clarify get-dtp.sh a bit.
-- Re-generate Java 6 patch.
-
-* Wed Mar 3 2010 Alexander Kurtakov <akurtako at redhat.com> 1.7.2-1
-- Update to 1.7.2.
-
-* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.7.1-1
-- Update to 1.7.1.
-
-* Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 1.7.0-5
-- Re-enable jar repacking now that RHBZ #461854 has been resolved.
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jul 14 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-3
-- Disable jar repacking because of a bug in redhat-rpm-config, see #461854.
-- Update dependency on wsdl4j.
-
-* Sun Jul 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-2
-- Build all features.
-- Add dependency on LPG.
-
-* Thu Jul 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-1
-- Update to 1.7.0 final release (Galileo).
-- Get map files from CVS instead of maintaining our own.
-- Require Eclipse 3.4.2.
-
-* Wed May 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.7.0-0.1.RC2
-- Update to 1.7.0 RC2.
-- Use %%global.
-
-* Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.2-2
-- Rebuild to not ship p2 context.xml.
-
-* Fri Feb 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.2-1
-- Update to 1.6.2.
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.1-3
-- Add patch to fix build with java 6.
-
-* Wed Feb 11 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.1-2
-- Set rt.jar to the build.
-- Do not own dropins folder.
-- Added comments about builded features and fixes.
-
-* Mon Feb 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.6.1-1
-- Initial package.
+- Fix too strict lucene.core scriptlet.
\ No newline at end of file
