[gnome-media: 1/2] git snapshot

[Matthias Clasen]

commit 6e726695241f98b7d30eac17a7ef95d21f5ca7c8
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 28 22:21:32 2010 -0400

    git snapshot

 .gitignore       |    1 +
 gnome-media.spec |   23 +++++++----------------
 gtk-build.patch  |   11 +++++++++++
 sources          |    2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bc36e7..35b8cef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-media-2.31.5.tar.bz2
+/gnome-media-2.31.5.58-146c.tar.bz2
diff --git a/gnome-media.spec b/gnome-media.spec
index d2d1c1d..cb5b8ab 100644
--- a/gnome-media.spec
+++ b/gnome-media.spec
@@ -6,17 +6,18 @@
 %define gail_version 1.2
 %define desktop_file_utils_version 0.2.90
 %define gstreamer_version 0.10.3
+%define alphatag git146c994
 
 %define gettext_package gnome-media-2.0
 
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.31.5
-Release:        4%{?dist}
+Release:        6.%{alphatag}%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 #VCS: git:git://git.gnome.org/gnome-media
-Source:         http://download.gnome.org/sources/gnome-media/2.31/gnome-media-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-media/2.31/gnome-media-%{version}.58-146c.tar.bz2
 
 URL:            http://www.gnome.org
 ExcludeArch:    s390 s390x
@@ -40,13 +41,6 @@ BuildRequires:  intltool
 BuildRequires:  control-center-devel
 BuildRequires:  scrollkeeper
 
-Patch0:         0001-Complete-the-GTK-3-port-by-using-unique-3.0.patch
-Patch1:         0001-Remove-libunique-3.0-dependency.patch
-BuildRequires:  automake autoconf libtool gnome-common intltool
-
-Patch2:         0001-Use-correct-command-for-sound-preferences.patch
-Patch3:         0001-Fix-GConf-handling-in-sound-theme.patch
-
 %description
 This package contains a few media utilities for the GNOME desktop,
 including a volume control and a configuration utility for audio profiles.
@@ -55,7 +49,6 @@ including a volume control and a configuration utility for audio profiles.
 Summary: Development files for gnome-media
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: gtk2-devel >= %{gtk2_version}
 Requires:  glade3-libgladeui-devel
 
 %description devel
@@ -82,12 +75,7 @@ in various formats and a configuration utility for the gstreamer media
 framework.
 
 %prep
-%setup -q
-%patch0 -p1 -b .unique3
-%patch1 -p1 -b .remove-unique
-%patch2 -p1 -b .panel
-%patch3 -p1 -b .gconf
-autoreconf -f
+%setup -q -n %{name}-%{version}.58-146c
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -315,6 +303,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Tue Sep 28 2010 Matthias Clasen <mclasen at redhat.com> 2.31.5-5
+- Fix build with newer gtk
+
 * Thu Jul 22 2010 Bastien Nocera <bnocera at redhat.com> 2.31.5-4
 - Fix GConf handling in sound theme editor (#617025)
 - Some minor bugs
diff --git a/gtk-build.patch b/gtk-build.patch
new file mode 100644
index 0000000..3137874
--- /dev/null
+++ b/gtk-build.patch
@@ -0,0 +1,11 @@
+diff -up gnome-media-2.31.5/profiles/audio-profiles-edit.c.gtk-build gnome-media-2.31.5/profiles/audio-profiles-edit.c
+--- gnome-media-2.31.5/profiles/audio-profiles-edit.c.gtk-build	2010-09-28 21:51:59.201472238 -0400
++++ gnome-media-2.31.5/profiles/audio-profiles-edit.c	2010-09-28 21:52:08.693472152 -0400
+@@ -596,7 +596,6 @@ gm_audio_profiles_edit_init (GMAudioProf
+                                  GTK_RESPONSE_ACCEPT,
+                                  NULL);
+ 
+-  gtk_dialog_set_has_separator (gdialog, FALSE);
+   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+   gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (gdialog)), 2); /* 2 * 5 + 2 = 12 */
+   gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (gdialog)), 5);
diff --git a/sources b/sources
index c9fce28..012079a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8b2854b55ffe5e15c4ad3fa32b3a848  gnome-media-2.31.5.tar.bz2
+1ddb1f45638e901a6f5cf3ae6aa3b802  gnome-media-2.31.5.58-146c.tar.bz2