rpms/gecko-mediaplayer/F-15 .cvsignore, 1.17, 1.18 gecko-mediaplayer.spec, 1.31, 1.32 sources, 1.17, 1.18 gecko-mediaplayer-applefix.patch, 1.2, NONE

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/gecko-mediaplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31997

Modified Files:
	.cvsignore gecko-mediaplayer.spec sources 
Removed Files:
	gecko-mediaplayer-applefix.patch 
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Jul 2011 20:10:28 -0000	1.17
+++ .cvsignore	29 Dec 2011 19:32:22 -0000	1.18
@@ -1 +1 @@
-gecko-mediaplayer-1.0.4.tar.gz
+gecko-mediaplayer-1.0.5.tar.gz


Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/gecko-mediaplayer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gecko-mediaplayer.spec	8 Jul 2011 07:21:11 -0000	1.31
+++ gecko-mediaplayer.spec	29 Dec 2011 19:32:22 -0000	1.32
@@ -1,32 +1,21 @@
 Name:           gecko-mediaplayer
-Version:        1.0.4
-Release:        3%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Gnome MPlayer browser plugin
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gecko-mediaplayer
 Source0:        http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         %{name}-applefix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-glib-devel
-%if 0%{?fedora} < 15
-BuildRequires:  GConf2-devel
-%endif
 BuildRequires:  gettext
+BuildRequires:  gmtk-devel == %{version}.0
 BuildRequires:  libcurl-devel
 BuildRequires:  libX11-devel
 BuildRequires:  gecko-devel
 
 Requires:       mozilla-filesystem
-Requires:       gnome-mplayer-binary >= %{version}
-
-%if 0%{?fedora} < 15
-Requires(pre):  GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
+Requires:       gnome-mplayer-binary%{?_isa} >= %{version}
 
 Obsoletes:      mplayerplug-in < 3.50
 
@@ -38,23 +27,15 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .applefix
 
 
 %build
-%if 0%{?fedora} == 14
-%configure --with-gconf
-%else
 %configure
-%endif
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} < 15
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -62,34 +43,8 @@
 rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
 
 
-%pre
-%if 0%{?fedora} < 15
-%gconf_schema_prepare gecko-mediaplayer
-%endif
-
-
-%post
-%if 0%{?fedora} < 15
-%gconf_schema_upgrade gecko-mediaplayer
-%endif
-
-
-%preun
-%if 0%{?fedora} < 15
-%gconf_schema_remove gecko-mediaplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %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
@@ -98,6 +53,18 @@
 
 
 %changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
+* Sat Jul 16 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-4
+- Added an easy way to pick between GSettings and GConf2
+- Rearranged the conditionals to avoid leaving empty %%pre et al.
+
 * Fri Jul 08 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-3
 - Updated the apple.com fix
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Jul 2011 20:10:28 -0000	1.17
+++ sources	29 Dec 2011 19:32:22 -0000	1.18
@@ -1 +1 @@
-7bb7665f8a1e6832907d052863e8f7aa  gecko-mediaplayer-1.0.4.tar.gz
+1a96daf878d06452c0fd9a13fd186021  gecko-mediaplayer-1.0.5.tar.gz


--- gecko-mediaplayer-applefix.patch DELETED ---