From 3cee5a0ae855e86a352b409daea2428c474654db Mon Sep 17 00:00:00 2001 From: Sami Wagiaalla Date: Thu, 9 Feb 2012 11:00:39 -0500 Subject: [PATCH] Small reconciler fixes and cleanup --- eclipse.spec | 12 ++++++++---- macros.eclipse | 6 ++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 5a1a2fc..29b4180 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -17,7 +17,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.8.I201202070800%{?dist} +Release: 0.9.I201202070800%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -367,7 +367,8 @@ fi # platform but to reprovision all other plugins which may have # already been installed in the system. if [ $1 -gt 1 ]; then - eclipse-reconciler.sh -debug -vmargs -Dosgi.checkConfiguration=true >& /dev/null + eclipse-reconciler.sh -vmargs -Dosgi.checkConfiguration=true \ + -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins >& /dev/null fi @@ -660,8 +661,11 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog -* Thu Feb 9 2012 Krzysztof Daniel 1:3.8.0-0.8.I201202070800 -- Update to I20120207-0800 +* Thu Feb 9 2012 Sami Wagiaalla 1:3.8.0-0.9.I201202070800 +- Remove -debug reconciler flag +- Remove macro _eclipse_reqs. +- Define %_eclipse_base in macros.eclipse. +- Pass dropins dir to reconciler when updating the platform. * Wed Feb 8 2012 Krzysztof Daniel 1:3.8.0-0.7.I201201310842 - Drop the indirect dependency to tomcat 5. diff --git a/macros.eclipse b/macros.eclipse index ccb2563..08d56eb 100644 --- a/macros.eclipse +++ b/macros.eclipse @@ -1,6 +1,8 @@ # RPM macros for eclipse packages. # +%_eclipse_base %{_libdir}/eclipse + %_eclipse_pkg_post \ touch /var/lib/rpm-state/eclipse/run-reconciler @@ -13,7 +15,3 @@ fi \ %_eclipse_pkg_posttrans \ eclipse-reconciler.sh > /dev/null - -%_eclipse_pkg_reqs \ -Requires(post): eclipse-platform >= 1:3.7.0-8 \ -Requires(postun): eclipse-platform >= 1:3.7.0-8 \