Author: belegdol Update of /cvs/free/rpms/gnome-mplayer/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv31335 Modified Files: .cvsignore gnome-mplayer.spec sources Removed Files: gnome-mplayer-applefix.patch Log Message: * Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 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/gnome-mplayer/F-15/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 1 Jul 2011 20:08:30 -0000 1.19 +++ .cvsignore 29 Dec 2011 19:30:20 -0000 1.20 @@ -1 +1 @@ -gnome-mplayer-1.0.4.tar.gz +gnome-mplayer-1.0.5.tar.gz Index: gnome-mplayer.spec =================================================================== RCS file: /cvs/free/rpms/gnome-mplayer/F-15/gnome-mplayer.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-mplayer.spec 8 Jul 2011 07:38:43 -0000 1.37 +++ gnome-mplayer.spec 29 Dec 2011 19:30:20 -0000 1.38 @@ -1,30 +1,20 @@ %bcond_without minimal Name: gnome-mplayer -Version: 1.0.4 -Release: 2%{?dist} +Version: 1.0.5 +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 -Patch0: %{name}-applefix.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 -%if 0%{?fedora} >= 15 +BuildRequires: gmtk-devel == %{version}.0 BuildRequires: gtk3-devel -%else -BuildRequires: gtk2-devel -%endif BuildRequires: libcurl-devel BuildRequires: libgpod-devel BuildRequires: libmusicbrainz3-devel @@ -34,11 +24,11 @@ BuildRequires: pulseaudio-libs-devel Requires: control-center-filesystem -Requires: gvfs-fuse -Requires: mencoder -Requires: %{name}-common = %{version}-%{release} +Requires: gvfs-fuse%{?_isa} +Requires: mencoder%{?_isa} +Requires: %{name}-common%{?_isa} = %{version}-%{release} -Provides: %{name}-binary = %{version}-%{release} +Provides: %{name}-binary%{?_isa} = %{version}-%{release} %description GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight @@ -50,14 +40,6 @@ %package common Summary: An MPlayer GUI, common files -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 @@ -70,9 +52,8 @@ %if %{with minimal} %package minimal Summary: An MPlayer GUI, a minimal version -Group: Applications/Multimedia -Requires: %{name}-common = %{version}-%{release} -Provides: %{name}-binary = %{version}-%{release} +Requires: %{name}-common%{?_isa} = %{version}-%{release} +Provides: %{name}-binary%{?_isa} = %{version}-%{release} %description minimal GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight @@ -86,9 +67,8 @@ %package nautilus Summary: An MPlayer GUI, nautilus extension -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: nautilus-extensions +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: nautilus-extensions%{?_isa} %description nautilus GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight @@ -103,42 +83,21 @@ %setup -qcT tar -xzf %{SOURCE0} mv %{name}-%{version} generic -pushd generic -%patch0 -p0 -b .applefix -popd %if %{with minimal} tar -xzf %{SOURCE0} mv %{name}-%{version} minimal -pushd minimal -%patch0 -p0 -b .applefix -popd %endif %build pushd generic -%if 0%{?fedora} >= 15 -%configure --enable-gtk3 -%else -%if 0%{?fedora} == 14 -%configure --with-gconf -%else %configure -%endif -%endif make %{?_smp_mflags} popd %if %{with minimal} pushd minimal %configure --program-suffix=-minimal --without-gio --without-libnotify \ -%if 0%{?fedora} >= 15 - --enable-gtk3 \ -%else -%if 0%{?fedora} == 14 - --with-gconf \ -%endif -%endif --without-libgpod --without-libmusicbrainz3 --disable-nautilus make %{?_smp_mflags} popd @@ -149,17 +108,11 @@ rm -rf $RPM_BUILD_ROOT pushd generic -%if 0%{?fedora} < 15 -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%endif make install DESTDIR=$RPM_BUILD_ROOT popd %if %{with minimal} pushd minimal -%if 0%{?fedora} < 15 -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%endif make install DESTDIR=$RPM_BUILD_ROOT popd %endif @@ -176,11 +129,6 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; -%pre common -%if 0%{?fedora} < 15 -%gconf_schema_prepare gnome-mplayer -%endif - %post update-desktop-database &> /dev/null || : @@ -189,74 +137,58 @@ update-desktop-database &> /dev/null || : -%post common -%if 0%{?fedora} < 15 -%gconf_schema_upgrade gnome-mplayer -%endif - - %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 -%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 0%{?fedora} < 15 -%gconf_schema_remove gnome-mplayer -%endif - - -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %{_bindir}/gnome-mplayer %{_datadir}/applications/rpmfusion-gnome-mplayer.desktop %{_datadir}/gnome-control-center/default-apps/gnome-mplayer.xml %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* %if %{with minimal} %files minimal -%defattr(-,root,root,-) %{_bindir}/gnome-mplayer-minimal %endif %files nautilus -%defattr(-,root,root,-) %{_libdir}/nautilus/extensions-?.0/libgnome-mplayer-properties-page.so* %changelog +* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 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(a)fedoraproject.org&gt; - 1.0.4-3 +- 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(a)fedoraproject.org&gt; - 1.0.4-2 - Fixed apple.com regression using a patch from SVN Index: sources =================================================================== RCS file: /cvs/free/rpms/gnome-mplayer/F-15/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 1 Jul 2011 20:08:30 -0000 1.19 +++ sources 29 Dec 2011 19:30:20 -0000 1.20 @@ -1 +1 @@ -c97dcf12d6a6b5543d701944f95e850e gnome-mplayer-1.0.4.tar.gz +1d3ab24c5501b5528e357931ca4dc6da gnome-mplayer-1.0.5.tar.gz --- gnome-mplayer-applefix.patch DELETED ---