rpms/unison227/EL-4 unison227.spec,1.2,1.3
Stephen Warren (swarren)
fedora-extras-commits at redhat.com
Sun Mar 30 18:04:50 UTC 2008
Author: swarren
Update of /cvs/pkgs/rpms/unison227/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24508/EL-4
Modified Files:
unison227.spec
Log Message:
Don't use alternatives for icon and desktop files, to solve bug 439551.
Index: unison227.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison227/EL-4/unison227.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unison227.spec 23 Mar 2008 18:01:24 -0000 1.2
+++ unison227.spec 30 Mar 2008 18:03:38 -0000 1.3
@@ -110,38 +110,17 @@
rm -rf %{buildroot}
%post
-%if 0%{?build_gui}
-%define build_gui_slash \
-%else
-%undefine build_gui_slash
-%endif
alternatives \
--install \
%{_bindir}/unison \
unison \
%{_bindir}/unison-%{ver_compat} \
- %{ver_priority} %{?build_gui_slash}
-%if 0%{?build_gui}
- --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
-%endif
+ %{ver_priority}
%postun
if [ $1 -eq 0 ]; then
alternatives --remove unison \
%{_bindir}/unison-%{ver_compat}
-%if 0%{?build_gui}
- alternatives --remove unison-icon \
- %{_datadir}/pixmaps/unison-%{ver_compat}.png
- alternatives --remove unison-desktop \
- %{_datadir}/applications/fedora-unison-%{ver_compat}.desktop
-%endif
fi
exit 0
@@ -155,9 +134,11 @@
%endif
%changelog
-* Sun Mar 23 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.27.57-7.el4.1
+* Sun Mar 30 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.27.57-7.el4.1
- Don't build GUI components for EPEL, because the OCAML GUI libs aren't
there yet.
+- 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.27.57-7
- Fix license to match correct interpretation of source & GPL
More information about the fedora-extras-commits
mailing list