rpms/gnome-mplayer/devel .cvsignore, 1.11, 1.12 gnome-mplayer.spec, 1.21, 1.22 sources, 1.11, 1.12 gnome-mplayer-flatvolume.patch, 1.1, NONE gnome-mplayer-inhibit.patch, 1.1, NONE

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26414

Modified Files:
	.cvsignore gnome-mplayer.spec sources 
Removed Files:
	gnome-mplayer-flatvolume.patch gnome-mplayer-inhibit.patch 
Log Message:
* Fri Jul 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.7-1
- Updated to 0.9.7
- Dropped upstreamed patches
- Added icon cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jun 2009 18:48:59 -0000	1.11
+++ .cvsignore	21 Aug 2009 18:38:17 -0000	1.12
@@ -1 +1 @@
-gnome-mplayer-0.9.6.tar.gz
+gnome-mplayer-0.9.7.tar.gz


Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-mplayer.spec	1 Jul 2009 16:18:34 -0000	1.21
+++ gnome-mplayer.spec	21 Aug 2009 18:38:17 -0000	1.22
@@ -1,16 +1,12 @@
 Name:           gnome-mplayer
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.7
+Release:        1%{?dist}
 Summary:        An MPlayer GUI, a full-featured binary
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gnomemplayer
 Source0:        http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-%if 0%{?fedora} >= 11
-Patch0:         gnome-mplayer-flatvolume.patch
-Patch1:         gnome-mplayer-inhibit.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -92,21 +88,11 @@
 mv %{name}-%{version} generic
 tar -xzf %{SOURCE0}
 mv %{name}-%{version} minimal
-%if 0%{?fedora} >= 11
-pushd generic
-%patch0 -p0 -b .flatvolume
-%patch1 -p0 -b .inhibit
-popd
-pushd minimal
-%patch0 -p0 -b .flatvolume
-%patch1 -p0 -b .inhibit
-popd
-%endif
 
 
 %build
 pushd generic
-%configure --disable-static
+%configure
 make %{?_smp_mflags}
 popd
 
@@ -165,6 +151,18 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun common
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans common
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %preun common
@@ -189,7 +187,8 @@
 %defattr(-,root,root,-)
 %doc generic/COPYING generic/ChangeLog generic/README generic/DOCS/keyboard_shortcuts.txt generic/DOCS/tech/*
 %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
-%{_datadir}/pixmaps/gnome-mplayer.png
+%{_datadir}/icons/hicolor/*/apps/gnome-mplayer.*
+%{_mandir}/man1/gnome-mplayer.1*
 
 
 %files minimal
@@ -203,6 +202,11 @@
 
 
 %changelog
+* Fri Jul 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.7-1
+- Updated to 0.9.7
+- Dropped upstreamed patches
+- Added icon cache scriptlets
+
 * Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
 - Fixed screensaver inhibition
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jun 2009 18:48:59 -0000	1.11
+++ sources	21 Aug 2009 18:38:17 -0000	1.12
@@ -1 +1 @@
-911e376dce8bbaf26bae2c70e3b3603b  gnome-mplayer-0.9.6.tar.gz
+09887967c1f853155df65732436120c6  gnome-mplayer-0.9.7.tar.gz


--- gnome-mplayer-flatvolume.patch DELETED ---


--- gnome-mplayer-inhibit.patch DELETED ---