[eclipse: 40/40] Merge branch 'master' into cbi
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Aug 21 14:12:56 UTC 2012
commit eeaf9612cb8a39dcea5ca5ea19b74a61a0fa7c3c
Merge: 453b225 f05d64a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Aug 21 14:22:10 2012 +0200
Merge branch 'master' into cbi
Conflicts:
eclipse.spec
.gitignore | 3 +
eclipse-copy-platform.sh | 104 ++
eclipse-do-not-run-as-root.patch | 45 +
...e-dont-download-old-platform-for-p2-tests.patch | 20 +
eclipse-dont-unpack-junit.patch | 12 +
eclipse-drop-user-profile-on-platform-change.patch | 32 +
eclipse-fix-compatibility-class.patch | 52 +
eclipse-fix-debug-ui.patch | 22 +
eclipse-fix-equinox-ip-imports.patch | 17 +
eclipse-fix-icu-import.patch | 29 +
eclipse-fix-master-ecf.patch | 165 ++
eclipse-fix-master-equinox.patch | 235 +++
eclipse-fix-pde-ui-compilation.patch | 29 +
eclipse-fix-sshd-id.patch | 16 +
eclipse-fix-transforms.patch | 11 +
eclipse-help-feature-adjust-dependencies.patch | 116 ++
eclipse-ignore-version-when-calculating-home.patch | 11 +
eclipse-no-source-for-dependencies.patch | 529 ++++++
...-osgi-serverside-patch-additional-imports.patch | 25 +
eclipse-osgi-unpack-sources.patch | 109 ++
eclipse-p2-pick-up-renamed-jars.patch | 11 +
eclipse-pdebuild.sh | 314 ++++
eclipse-populate-update-sites-from-master.patch | 260 +++
eclipse-remove-jgit-provider.patch | 22 +
eclipse-remove-w3c-smil-and-use-geronimo.patch | 29 +
eclipse-remove-weaving.patch | 52 +
eclipse-set-1.6-bree.patch | 55 +
eclipse.desktop | 8 +
eclipse.spec | 862 ++++++++--
efj.sh | 5 +
extract_patterns.txt | 1 +
get-eclipse.sh | 15 +
initializer.pom.xml | 36 +
lucene-3.6-compile.patch | 4 +-
pre360changelog.txt | 1836 --------------------
rt.incubator.pom.xml | 34 +
sources | 4 +-
37 files changed, 3121 insertions(+), 2009 deletions(-)
---
diff --cc eclipse.spec
index 8b88ac1,85815bd..cf3ae80
--- a/eclipse.spec
+++ b/eclipse.spec
@@@ -418,71 -971,7 +970,6 @@@ rm -rf %{_bindir}/efj
%{_libdir}/%{name}/swt.jar
%{_libdir}/java/swt.jar
- %files rcp
- %dir %{_libdir}/%{name}/features
- %dir %{_datadir}/%{name}
- %dir %{_libdir}/%{name}/configuration
- %{_libdir}/%{name}/configuration/config.ini
- %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
- %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
- %{_libdir}/%{name}/readme
- %{_libdir}/%{name}/features/org.eclipse.rcp_*
- %{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
- %{_libdir}/%{name}/plugins/com.ibm.icu_*
- %{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar
- %{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar
- %{_libdir}/%{name}/plugins/org.apache.batik.css_*
- %{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
- %{_libdir}/%{name}/plugins/org.apache.batik.util_*
- %{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
- %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
- %{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
- %{_libdir}/%{name}/plugins/org.eclipse.help_*
- %{_libdir}/%{name}/plugins/org.eclipse.jface_*
- %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
- %{_libdir}/%{name}/plugins/org.eclipse.rcp_*
- %{_libdir}/%{name}/plugins/org.eclipse.ui_*
- %{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
- %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
- %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
- %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
- %{_libdir}/%{name}/plugins/org.w3c.css.sac_*
- %{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
--
%if %{initialize}
%files platform -f %{name}-platform.install
%else
@@@ -694,22 -1213,13 +1215,25 @@@
%{_libdir}/%{name}/plugins/org.eclipse.osgi_*
%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-osgi*.pom
+%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
-* Tue Aug 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-10
++* Tue Aug 21 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-9
+ - Adopt upstream CBI system.
+
+* Tue Aug 14 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-8
+- Symlink emf bundles.
+
+* Tue Aug 14 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-7
+- Reduce the emf-core dependency strength.
+
+* Wed Aug 1 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1:4.2.0-6
+- Move maven fragments and pom files in appropriate subpackages
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Tue Jul 17 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-4
- Bug 839986 - eclipse-rcp: broken symlinks
More information about the scm-commits
mailing list