rpms/unison213/F-7 unison213.spec,1.4,1.5

[Stephen Warren (swarren)]

Author: swarren

Update of /cvs/pkgs/rpms/unison213/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18447/F-7

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-7/unison213.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison213.spec	26 Mar 2008 04:08:35 -0000	1.4
+++ unison213.spec	30 Mar 2008 18:02:22 -0000	1.5
@@ -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 @@
   %{_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.fc7.3
+- 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.fc7.2
 - F-7 koji builds for ppc64, so need "ExcludeArch: ppc64" here too.