rpms/gecko-mediaplayer/devel .cvsignore, 1.15, 1.16 gecko-mediaplayer.spec, 1.24, 1.25 sources, 1.15, 1.16 gecko-mediaplayer-1.0.0-libxul2.patch, 1.1, NONE

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10196

Modified Files:
	.cvsignore gecko-mediaplayer.spec sources 
Removed Files:
	gecko-mediaplayer-1.0.0-libxul2.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/gecko-mediaplayer/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Nov 2010 01:18:40 -0000	1.15
+++ .cvsignore	25 Apr 2011 21:13:55 -0000	1.16
@@ -1 +1 @@
-gecko-mediaplayer-1.0.0.tar.gz
+gecko-mediaplayer-1.0.3.tar.gz


Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gecko-mediaplayer.spec	6 Nov 2010 10:06:38 -0000	1.24
+++ gecko-mediaplayer.spec	25 Apr 2011 21:13:56 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           gecko-mediaplayer
-Version:        1.0.0
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Gnome MPlayer browser plugin
 
@@ -11,7 +11,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
+%if 0%{?fedora} < 15
 BuildRequires:  GConf2-devel
+%endif
 BuildRequires:  gettext
 BuildRequires:  libX11-devel
 BuildRequires:  gecko-devel
@@ -19,9 +21,11 @@
 Requires:       mozilla-filesystem
 Requires:       gnome-mplayer-binary >= %{version}
 
+%if 0%{?fedora} < 15
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+%endif
 
 Obsoletes:      mplayerplug-in < 3.50
 
@@ -33,11 +37,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxul2
 
 
 %build
+%if 0%{?fedora} == 14
+%configure --with-gconf
+%else
 %configure
+%endif
 make %{?_smp_mflags}
 
 
@@ -52,28 +59,21 @@
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.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 gecko-mediaplayer
+%endif
 
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
+%if 0%{?fedora} < 15
+%gconf_schema_upgrade gecko-mediaplayer
+%endif
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
-fi
+%if 0%{?fedora} < 15
+%gconf_schema_remove gecko-mediaplayer
+%endif
 
 
 %clean
@@ -83,7 +83,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
+%if 0%{?fedora} < 15
 %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
+%endif
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -92,6 +94,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
+
 * Sat Nov 06 2010 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.0-1
 - Updated to 1.0.0
 - Fixed xulrunner 2 detection


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Nov 2010 01:18:41 -0000	1.15
+++ sources	25 Apr 2011 21:13:56 -0000	1.16
@@ -1 +1 @@
-80ccb671aea90153be9f9e6dc41b7eae  gecko-mediaplayer-1.0.0.tar.gz
+4996b243ed720dc30f5dcc9bc253bf68  gecko-mediaplayer-1.0.3.tar.gz


--- gecko-mediaplayer-1.0.0-libxul2.patch DELETED ---