diff --git a/unison213.spec b/unison213.spec index 4f89c01..636ba70 100644 --- a/unison213.spec +++ b/unison213.spec @@ -23,7 +23,7 @@ Name: unison%{ver_compat_name} Version: %{ver_compat}%{ver_noncompat} -Release: 9%{?dist}.2 +Release: 9%{?dist}.3 Summary: Multi-master File synchronization tool @@ -106,24 +106,18 @@ alternatives \ %{_bindir}/unison \ unison \ %{_bindir}/unison-%{ver_compat} \ - %{ver_priority} \ - --slave \ - %{_datadir}/pixmaps/unison.png \ - unison-icon \ - %{_datadir}/pixmaps/unison-%{ver_compat}.png \ - --slave \ - %{_datadir}/applications/fedora-unison.desktop \ - unison-desktop \ - %{_datadir}/applications/fedora-unison-%{ver_compat}.desktop + %{ver_priority} + +# Clean up after previous package version's incorrect alternatives usage. +alternatives --remove unison-icon \ + %{_datadir}/pixmaps/unison-%{ver_compat}.png || : +alternatives --remove unison-desktop \ + %{_datadir}/applications/fedora-unison-%{ver_compat}.desktop || : %postun if [ $1 -eq 0 ]; then alternatives --remove unison \ %{_bindir}/unison-%{ver_compat} - alternatives --remove unison-icon \ - %{_datadir}/pixmaps/unison-%{ver_compat}.png - alternatives --remove unison-desktop \ - %{_datadir}/applications/fedora-unison-%{ver_compat}.desktop fi exit 0 @@ -135,6 +129,10 @@ exit 0 %{_datadir}/pixmaps/unison-%{ver_compat}.png %changelog +* Sun Mar 30 2008 Stephen Warren - 2.13.16-9.fc7.3 +- Don't use alternatives for desktop and icon files, to avoid duplicate + menu entries. + * Sat Mar 22 2008 Stephen Warren - 2.13.16-9.fc7.2 - F-7 koji builds for ppc64, so need "ExcludeArch: ppc64" here too.