[xfce4-mixer] - Patch for xfce4-panel >= 4.7.7

[Christoph Wickert]

commit 951bc8b1bd1ff40084979549b11d9bcb25629183
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 8 23:39:57 2011 +0100

    - Patch for xfce4-panel >= 4.7.7

 xfce4-mixer-4.6.1-xfce4-panel-4.7.7.patch |   11 ++++
 xfce4-mixer.spec                          |   94 +++++++++++++++++-----------
 2 files changed, 68 insertions(+), 37 deletions(-)
---
diff --git a/xfce4-mixer-4.6.1-xfce4-panel-4.7.7.patch b/xfce4-mixer-4.6.1-xfce4-panel-4.7.7.patch
new file mode 100644
index 0000000..542ffe6
--- /dev/null
+++ b/xfce4-mixer-4.6.1-xfce4-panel-4.7.7.patch
@@ -0,0 +1,11 @@
+--- xfce4-mixer-4.6.1.orig/panel-plugin/Makefile.in	2009-04-19 01:12:45.000000000 +0200
++++ xfce4-mixer-4.6.1/panel-plugin/Makefile.in	2011-01-02 23:10:25.039802353 +0100
+@@ -310,7 +310,7 @@
+ 	-lgstinterfaces-0.10
+ 
+ desktopdir = \
+-	$(datadir)/xfce4/panel-plugins
++	$(datadir)/xfce4/panel/plugins
+ 
+ desktop_in_in_files = \
+ 	xfce4-mixer-plugin.desktop.in.in
diff --git a/xfce4-mixer.spec b/xfce4-mixer.spec
index 2ec1b56..9412343 100644
--- a/xfce4-mixer.spec
+++ b/xfce4-mixer.spec
@@ -1,72 +1,92 @@
-Summary: Volume control plugin for the Xfce 4 panel
-Name: xfce4-mixer
-Version: 4.6.1
-Release: 2%{?dist}
-License: GPLv2+
-URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-mixer-%{version}.tar.bz2
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce4-panel >= %{version}
-BuildRequires: xfce4-panel-devel >= %{version}
-BuildRequires: libxfce4util-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: startup-notification-devel
-BuildRequires: gettext intltool
-BuildRequires: alsa-lib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: gstreamer-devel
-BuildRequires: xfconf-devel
+%global xfceversion 4.6
+
+Name:           xfce4-mixer
+Version:        4.6.1
+Release:        4%{?dist}
+Summary:        Volume control plugin for the Xfce 4 panel
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/apps/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         xfce4-mixer-4.6.1-xfce4-panel-4.7.7.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfce4util-devel >= %{xfceversion}
+BuildRequires:  libxfcegui4-devel >= %{xfceversion}
+BuildRequires:  xfce4-panel-devel >= %{xfceversion}
+BuildRequires:  xfconf-devel
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  startup-notification-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gettext intltool
+BuildRequires:  desktop-file-utils
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
-Volume control plugin for the Xfce 4 panel.
+The Xfce mixer is a volume control application for the Xfce Desktop Environment.
+It provides both a volume control plugin for the Xfce Panel and a standalone 
+mixer application.
+
 
 %prep
 %setup -q
+%patch0 -p1 -b .xfce4-panel-4.7.7.patch
+
 
 %build
 %configure --with-sound=alsa
-
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
-desktop-file-install --vendor ""                                \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        xfce4-mixer/xfce4-mixer.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README TODO ChangeLog COPYING AUTHORS NEWS
 %{_bindir}/xfce4-mixer
 %{_datadir}/applications/xfce4-mixer.desktop
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
-%dir %{_datadir}/pixmaps/xfce4-mixer
-%{_datadir}/pixmaps/xfce4-mixer/chain-broken.png
-%{_datadir}/pixmaps/xfce4-mixer/chain.png
-%{_datadir}/xfce4-mixer/icons/hicolor/*/status/*
-%{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
+%{_datadir}/pixmaps/xfce4-mixer/
+%{_datadir}/xfce4-mixer/icons/hicolor/*/*/*
+%{_datadir}/xfce4/panel/plugins/*.desktop
 
 %changelog
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Patch for xfce4-panel >= 4.7.7
+
+* Mon Dec 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Rebuild for Xfce 4.8 pre2
+- Update gtk-icon-cache scriptlets
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild