rpms/unison213/F-8 unison213.spec,1.3,1.4
Stephen Warren (swarren)
fedora-extras-commits at redhat.com
Sun Mar 30 18:03:15 UTC 2008
Author: swarren
Update of /cvs/pkgs/rpms/unison213/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18447/F-8
Modified Files:
unison213.spec
Log Message:
Don't use alternatives for icon and desktop files, to solve bug 439551.
Index: unison213.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison213/F-8/unison213.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unison213.spec 26 Mar 2008 04:08:48 -0000 1.3
+++ unison213.spec 30 Mar 2008 18:02:32 -0000 1.4
@@ -23,7 +23,7 @@
Name: unison%{ver_compat_name}
Version: %{ver_compat}%{ver_noncompat}
-Release: 9%{?dist}.1
+Release: 9%{?dist}.2
Summary: Multi-master File synchronization tool
@@ -106,24 +106,18 @@
%{_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 @@
%{_datadir}/pixmaps/unison-%{ver_compat}.png
%changelog
+* Sun Mar 30 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-9.fc8.2
+- Don't use alternatives for desktop and icon files, to avoid duplicate
+ menu entries.
+
* Sat Mar 22 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-9.fc8.1
- Add ExcludeArch:ppc64 since ocaml isn't available there yet on F-8
More information about the fedora-extras-commits
mailing list