Small reconciler fixes and cleanup

This commit is contained in:
Sami Wagiaalla 2012-02-09 11:00:39 -05:00
parent 2b1082b26a
commit 3cee5a0ae8
2 changed files with 10 additions and 8 deletions

View File

@ -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 <kdaniel@redhat.com> 1:3.8.0-0.8.I201202070800
- Update to I20120207-0800
* Thu Feb 9 2012 Sami Wagiaalla <swagiaal@redhat.com> 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 <kdaniel@redhat.com> 1:3.8.0-0.7.I201201310842
- Drop the indirect dependency to tomcat 5.

View File

@ -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 \