Re-base to lastest f21

- Require scl-ised webkitgtk3

eclipse.spec

@@ -39,7 +39,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        10.1%{?dist}
+Release:        12.1%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -132,8 +132,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: java-1.8.0-openjdk-devel
 BuildRequires: libXt-devel
 BuildRequires: webkitgtk-devel
-BuildRequires: webkitgtk3
-BuildRequires: webkitgtk3-devel
+BuildRequires: %{?scl_prefix}webkitgtk3-devel
 BuildRequires: geronimo-annotation >= 1.0-7
 BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:52.1
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
@@ -193,7 +192,7 @@ Requires:       jpackage-utils
 Requires:       gtk2
 Requires:       gtk3
 Requires:       webkitgtk
-Requires:       webkitgtk3
+Requires:       %{?scl_prefix}webkitgtk3
 
 %description swt
 SWT Library for GTK+.
@@ -510,8 +509,8 @@ xmvn -o clean verify \
 %endif
    -Declipse.javadoc=/usr/bin/javadoc \
    -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
-   -Dtycho.local.keepTarget -DbuildId=`echo "%{release}" | tr -d "."` \
-   -Dtargets=install -Ddirector.running.env.only=true
+   -Dtycho.local.keepTarget -Ddirector.running.env.only=true \
+   -Dtargets=install
 %{?scl:EOF}
 
 #ant again
@@ -1027,6 +1026,16 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-12.1
+- Re-base to lastest f21
+- Require scl-ised webkitgtk3
+
+* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-12
+- Drop custom buildId, to keep it lexographically greater than upstream's
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Wed Aug 13 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-10.1
 - Re-base to lastest f21