rpms/gst-mixer/F-11 gst-mixer.spec,1.1,1.2

[Adam Williamson]

Author: adamwill

Update of /cvs/pkgs/rpms/gst-mixer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12222

Modified Files:
	gst-mixer.spec 
Log Message:
- from Christoph Wickert: fix Help menus, add Mixer menu category



Index: gst-mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gst-mixer/F-11/gst-mixer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gst-mixer.spec	4 May 2009 21:15:51 -0000	1.1
+++ gst-mixer.spec	20 Jul 2009 16:00:24 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:        Legacy gnome-volume-control for advanced use cases
 Name:           gst-mixer
 Version:        2.26.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Source:         http://download.gnome.or
 Patch0:         gst-mixer-2.26.0-rebrand.patch
 # Fixes Launchpad bug #345645 (patch from that report / upstream)
 Patch1:         gst-mixer-2.26.0-switch.patch
+Patch2:         gst-mixer-2.26.0-help-uri.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://www.gnome.org
 ExcludeArch:    s390 s390x
@@ -33,6 +34,7 @@ BuildRequires:  libcanberra-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
 BuildRequires:  unique-devel
+BuildRequires:  desktop-file-utils
 # for patch 0
 BuildRequires:  autoconf automake libtool
 
@@ -49,6 +51,7 @@ GNOME volume control application cannot 
 %setup -q -n gnome-media-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mv gst-mixer/gnome-volume-control.desktop.in.in gst-mixer/gst-mixer.desktop.in.in
 mv gst-mixer/gnome-volume-control.schemas.in gst-mixer/gst-mixer.schemas.in
@@ -111,6 +114,11 @@ done
 
 %find_lang %{gettext_package} --all-name --with-gnome
 
+desktop-file-install \
+  --add-category=Mixer \
+  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -159,6 +167,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/*
 
 %changelog
+* Sun Jul 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.26.0-3
+- Fix 'Help' button (#508531)
+- Add category 'Mixer' to menu enty for nested menus in multimedia-menus
+
 * Fri May 1 2009 Adam Williamson <awilliam at redhat.com> - 2.26.0-2
 - Drop a bunch of %%defines in the spec as recommended for review