From 41a5f971159bbdf3daac31bc2e627b881c57c611 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Jan 12 2007 21:37:26 +0000 Subject: - Fix %%postun problem in the sdk sub-package. --- diff --git a/eclipse.spec b/eclipse.spec index b1846dd..9d7d97b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -19,7 +19,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 29%{?dist} +Release: 30%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -358,7 +358,7 @@ Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release} -Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release} Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} # This file requirement is to deal with the biarch installation case @@ -1029,7 +1029,7 @@ done # Create file listings for the extracted shared libraries echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; for id in `ls configuration/org.eclipse.osgi/bundles`; do - if [ "Aconfiguration" = $(echo A`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then + if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install; else echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; @@ -1075,7 +1075,7 @@ ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png \ # Remove unused icon.xpm # This should be fixed in 3.3. # see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm %endif # Install the efj wrapper script @@ -1729,6 +1729,9 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Fri Jan 12 2007 Ben Konrath 3.2.1-30 +- Fix %%postun problem in the sdk sub-package. + * Thu Jan 11 2007 Ben Konrath 3.2.1-29 - Remove SWT JNI symlinks from %%{libdir}.