rpms/unison213/devel unison213.spec,1.1,1.2
Stephen Warren (swarren)
fedora-extras-commits at redhat.com
Sun Mar 30 18:03:24 UTC 2008
Author: swarren
Update of /cvs/pkgs/rpms/unison213/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18447/devel
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/devel/unison213.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unison213.spec 23 Mar 2008 01:32:04 -0000 1.1
+++ unison213.spec 30 Mar 2008 18:02:45 -0000 1.2
@@ -23,7 +23,7 @@
Name: unison%{ver_compat_name}
Version: %{ver_compat}%{ver_noncompat}
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Multi-master File synchronization tool
@@ -103,24 +103,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
@@ -132,6 +126,10 @@
%{_datadir}/pixmaps/unison-%{ver_compat}.png
%changelog
+* Sun Mar 30 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-10
+- Don't use alternatives for desktop and icon files, to avoid duplicate
+ menu entries.
+
* Wed Mar 19 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-9
- Fix license to match correct interpretation of source & GPL
- Remove Excludes for ppc64, since ocaml is available there now, in devel
More information about the fedora-extras-commits
mailing list