rpms/xfce4-mixer/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-mixer.spec, 1.18, 1.19

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-mixer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9315

Modified Files:
	.cvsignore sources xfce4-mixer.spec 
Log Message:
* Sat Nov 15 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
- Fix categories of the desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Dec 2007 05:55:42 -0000	1.9
+++ .cvsignore	29 Mar 2009 21:28:57 -0000	1.10
@@ -1 +1 @@
-xfce4-mixer-4.4.2.tar.bz2
+xfce4-mixer-4.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Dec 2007 05:55:42 -0000	1.9
+++ sources	29 Mar 2009 21:28:57 -0000	1.10
@@ -1 +1 @@
-c21cb5680f135dc86e5f0a6f9473003a  xfce4-mixer-4.4.2.tar.bz2
+0d7b402acaffdb5d8b292f2ce3ea1441  xfce4-mixer-4.4.3.tar.bz2


Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/F-9/xfce4-mixer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfce4-mixer.spec	10 Feb 2008 23:51:41 -0000	1.18
+++ xfce4-mixer.spec	29 Mar 2009 21:28:57 -0000	1.19
@@ -1,10 +1,10 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.4.2
-Release: 2%{?dist}
+Version: 4.4.3
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-mixer-4.4.2.tar.bz2
+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}
@@ -17,6 +17,7 @@
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 
 %description
 Volume control plugin for the Xfce 4 panel.
@@ -24,10 +25,13 @@
 %prep
 %setup -q
 
+# fix for http://bugzilla.xfce.org/show_bug.cgi?id=4538
+rm panel-plugin/xfce4-mixer.desktop
+
 %build
 %configure --with-sound=alsa
 
-# removed %{?_smp_mflags} for now. Broken in 4.4.1
+# removed %{?_smp_mflags} for now. Broken since 4.4.1
 make
 
 %install
@@ -36,16 +40,27 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
 %find_lang %{name}
 
+#desktop-file-install --vendor ""                                \
+#        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+#        --add-category AudioVideo                               \
+#        --add-category GTK                                      \
+#        --remove-category Application                           \
+#        --add-only-show-in XFCE                                 \
+#        --delete-original                                       \
+#        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -56,9 +71,21 @@
 %{_datadir}/applications/xfce-mixer-settings.desktop
 %{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
+#%{_datadir}/applications/xfce4-mixer.desktop
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Sat Nov 15 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-3
+- Fix categories of the desktop file
+
+* Sat Nov 15 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-2
+- Fix desktop file (bugzilla.xfce.org #4538)
+
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
+- Update to 4.4.3
+- Update gtk-update-icon-cache scriptlets
+- Add xfce4-mixer menu entry in the Xfce menu
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-2
 - Rebuild for gcc43