diff --git a/eclipse.spec b/eclipse.spec index b370f08..e011dc5 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M6.9 +Release: 0.M6.10 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -128,6 +128,7 @@ Obsoletes: ecj Provides: ecj %if %{gcj_support} Requires: libgcj >= 4.0.0-0.42 +Requires(post,postun): java-1.4.2-gcj-compat %else Requires: java >= 1.4.2 %endif @@ -146,6 +147,7 @@ Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release} %if %{gcj_support} Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_14rh Requires: libgcj >= 4.0.0-0.42 +Requires(post,postun): java-1.4.2-gcj-compat %else Requires: java >= 1.4.2 %endif @@ -181,6 +183,7 @@ Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} %if %{gcj_support} Requires: libgcj >= 4.0.0-0.42 +Requires(post,postun): java-1.4.2-gcj-compat %endif %description jdt @@ -200,6 +203,7 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release} %if %{gcj_support} +Requires(post,postun): java-1.4.2-gcj-compat Requires: libgcj >= 4.0.0-0.42 %endif @@ -220,6 +224,10 @@ Eclipse PDE. %package -n %{libname}-gtk2 Summary: SWT Library for GTK2 Group: Text Editors/Integrated Development Environments (IDE) +%if %{gcj_support} +Requires(post,postun): java-1.4.2-gcj-compat +Requires: libgcj >= 4.0.0-0.42 +%endif %description -n %{libname}-gtk2 SWT Library for GTK2. @@ -814,21 +822,21 @@ rm -rf $RPM_BUILD_ROOT %if %{gcj_support} %post ecj -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %post jdt -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %post pde -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %post -n %{libname}-gtk2 -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %endif %post platform %if %{gcj_support} -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -837,21 +845,21 @@ fi %if %{gcj_support} %postun ecj -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %postun jdt -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %postun pde -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %postun -n %{libname}-gtk2 -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %endif %postun platform %if %{gcj_support} -rebuild-gcj-db %{_libdir} +/usr/bin/rebuild-gcj-db %{_libdir} %endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -1022,6 +1030,10 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Fri Apr 22 2005 Andrew Overholt 3.1.0_fc-0.M6.10 +- Add Requires(post,postun): java-1.4.2-gcj-compat for each sub-package and use + full path (Joe Orton). + * Thu Apr 21 2005 Andrew Overholt 3.1.0_fc-0.M6.9 - Use upstream icons (not RHDS ones) (rh#146484). - Add plugin directories to %files sections.