rpms/gnome-mplayer/devel .cvsignore, 1.17, 1.18 gnome-mplayer.spec, 1.33, 1.34 sources, 1.17, 1.18 gnome-mplayer-av.patch, 1.1, NONE

[Julian Sikorski]

Author: belegdol

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

Modified Files:
	.cvsignore gnome-mplayer.spec sources 
Removed Files:
	gnome-mplayer-av.patch 
Log Message:
* Mon Apr 25 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.3-1
- Dropped included patches
- Added logic to support gsettings/GConf
- Updated GConf scriptlets to the latest spec



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Mar 2011 21:58:52 -0000	1.17
+++ .cvsignore	25 Apr 2011 21:14:33 -0000	1.18
@@ -1 +1 @@
-gnome-mplayer-1.0.2.tar.gz
+gnome-mplayer-1.0.3.tar.gz


Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-mplayer.spec	4 Mar 2011 22:15:23 -0000	1.33
+++ gnome-mplayer.spec	25 Apr 2011 21:14:33 -0000	1.34
@@ -1,7 +1,7 @@
 %bcond_without minimal
 
 Name:           gnome-mplayer
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        An MPlayer GUI, a full-featured binary
 
@@ -9,13 +9,14 @@
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gnomemplayer
 Source0:        http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch2:         gnome-mplayer-av.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
+%if 0%{?fedora} < 15
 BuildRequires:  GConf2-devel
+%endif
 BuildRequires:  gettext
 BuildRequires:  gnome-power-manager
 BuildRequires:  gtk2-devel
@@ -47,9 +48,11 @@
 Group:          Applications/Multimedia
 Requires:       mplayer
 
+%if 0%{?fedora} < 15
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+%endif
 
 %description common
 GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -95,27 +98,28 @@
 %setup -qcT
 tar -xzf %{SOURCE0}
 mv %{name}-%{version} generic
-pushd generic
-%patch2 -p2 -b .av
-popd
 %if %{with minimal}
 tar -xzf %{SOURCE0}
 mv %{name}-%{version} minimal
-pushd minimal
-%patch2 -p2 -b .av
-popd
 %endif
 
 
 %build
 pushd generic
+%if 0%{?fedora} == 14
+%configure --with-gconf
+%else
 %configure
+%endif
 make %{?_smp_mflags}
 popd
 
 %if %{with minimal}
 pushd minimal
 %configure --program-suffix=-minimal --without-gio --without-libnotify \
+%if 0%{?fedora} == 14
+    --with-gconf \
+%endif
     --without-libgpod --without-libmusicbrainz3 --disable-nautilus
 make %{?_smp_mflags}
 popd
@@ -150,15 +154,9 @@
 
 
 %pre common
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas >/dev/null || :
-    # If the schema file has ever been renamed::
-    #gconftool-2 --makefile-uninstall-rule \
-    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
-
+%if 0%{?fedora} < 15
+%gconf_schema_prepare gnome-mplayer
+%endif
 
 %post
 update-desktop-database &> /dev/null || :
@@ -169,10 +167,9 @@
 
 
 %post common
-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 || :
+%if 0%{?fedora} < 15
+%gconf_schema_upgrade gnome-mplayer
+%endif
 
 
 %postun common
@@ -180,18 +177,24 @@
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+%if 0%{?fedora} >= 15
+if [ $1 -eq 0 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+%endif
 
 
 %posttrans common
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%if 0%{?fedora} >= 15
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+%endif
 
 
 %preun common
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
-fi
+%if 0%{?fedora} < 15
+%gconf_schema_remove gnome-mplayer
+%endif
 
 
 %clean
@@ -208,7 +211,12 @@
 %files common -f %{name}.lang
 %defattr(-,root,root,-)
 %doc generic/COPYING generic/ChangeLog generic/README generic/DOCS/keyboard_shortcuts.txt generic/DOCS/tech/*
+%if 0%{?fedora} < 15
 %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
+%else
+%{_datadir}/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
+%{_datadir}/glib-2.0/schemas/apps.gnome-mplayer.preferences.*
+%endif
 %{_datadir}/icons/hicolor/*/apps/gnome-mplayer.*
 %{_mandir}/man1/gnome-mplayer.1*
 
@@ -226,6 +234,11 @@
 
 
 %changelog
+* Mon Apr 25 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.3-1
+- Dropped included patches
+- Added logic to support gsettings/GConf
+- Updated GConf scriptlets to the latest spec
+
 * Fri Mar 04 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.2-1
 - Updated to 1.0.2
 - Dropped included patches


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	4 Mar 2011 21:58:52 -0000	1.17
+++ sources	25 Apr 2011 21:14:33 -0000	1.18
@@ -1 +1 @@
-2cbba8838ecaa03a4c3a0190dcabfade  gnome-mplayer-1.0.2.tar.gz
+72a1c7d640a67eb2d60f2671108919c2  gnome-mplayer-1.0.3.tar.gz


--- gnome-mplayer-av.patch DELETED ---