rpms/gnome-mplayer/F-14 .cvsignore, 1.18, 1.19 gnome-mplayer.spec, 1.35, 1.36 sources, 1.18, 1.19

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/gnome-mplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27696

Modified Files:
	.cvsignore gnome-mplayer.spec sources 
Log Message:
* Fri Jul 01 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-1
- Updated to 1.0.4
- Enabled gtk3 on Fedora 15 and above



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Apr 2011 21:14:41 -0000	1.18
+++ .cvsignore	1 Jul 2011 20:08:39 -0000	1.19
@@ -1 +1 @@
-gnome-mplayer-1.0.3.tar.gz
+gnome-mplayer-1.0.4.tar.gz


Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/gnome-mplayer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-mplayer.spec	25 Apr 2011 21:14:41 -0000	1.35
+++ gnome-mplayer.spec	1 Jul 2011 20:08:40 -0000	1.36
@@ -1,7 +1,7 @@
 %bcond_without minimal
 
 Name:           gnome-mplayer
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        An MPlayer GUI, a full-featured binary
 
@@ -19,7 +19,11 @@
 %endif
 BuildRequires:  gettext
 BuildRequires:  gnome-power-manager
+%if 0%{?fedora} >= 15
+BuildRequires:  gtk3-devel
+%else
 BuildRequires:  gtk2-devel
+%endif
 BuildRequires:  libcurl-devel
 BuildRequires:  libgpod-devel
 BuildRequires:  libmusicbrainz3-devel
@@ -106,20 +110,28 @@
 
 %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
@@ -130,13 +142,17 @@
 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
@@ -234,6 +250,10 @@
 
 
 %changelog
+* Fri Jul 01 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.4-1
+- Updated to 1.0.4
+- Enabled gtk3 on Fedora 15 and above
+
 * Mon Apr 25 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.0.3-1
 - Dropped included patches
 - Added logic to support gsettings/GConf


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Apr 2011 21:14:41 -0000	1.18
+++ sources	1 Jul 2011 20:08:40 -0000	1.19
@@ -1 +1 @@
-72a1c7d640a67eb2d60f2671108919c2  gnome-mplayer-1.0.3.tar.gz
+c97dcf12d6a6b5543d701944f95e850e  gnome-mplayer-1.0.4.tar.gz