diff --git a/eclipse.spec b/eclipse.spec index 1cfc132..01b93b0 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -49,7 +49,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 12%{?dist} +Release: 13%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -237,14 +237,8 @@ everything in between. %package swt Summary: SWT Library for GTK+ -Requires: java >= 1:1.7.0 +%if 0%{?rhel} Requires: jpackage-utils -%if 0%{?fedora} -Requires: gtk2 -Requires: gtk3 -Requires: webkitgtk -Requires: webkitgtk4 -%else %if 0%{?rhel} >= 7 Requires: gtk3 Requires: webkitgtk3 @@ -1136,6 +1130,10 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Wed Feb 17 2016 Mat Booth - 1:4.5.1-13 +- Preserve more test data that we cannot generate from source +- Eliminate unnecessary manual requires from swt package + * Wed Feb 17 2016 Mat Booth - 1:4.5.1-12 - Make test framework correctly delete symlinks so that test suites may complete when e.g. pydev is installed rhbz#1290685 diff --git a/get-eclipse.sh b/get-eclipse.sh index 0acb205..c8131cd 100755 --- a/get-eclipse.sh +++ b/get-eclipse.sh @@ -26,7 +26,6 @@ find . -type f -name *.class -delete find . -type f -name *.so -delete find . -type f -name *.dll -delete find . -type f -name *.jnilib -delete -find . -type f -name *.exe -delete # Remove pre-compiled native launchers rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ diff --git a/sources b/sources index 965a1aa..6cc6ba5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e5d41fe15276fc027f0c5877be0abfbd R4_platform-aggregator-R4_5_1.tar.xz +d174d78ab4ad16ad6ece0539e456347a R4_platform-aggregator-R4_5_1.tar.xz 7734705e9d6be9de1308ba16e1675601 org.eclipse.linuxtools.eclipse-build-60b198a9d667c8f038d72c8fb49e628bd30fb714.tar.xz