[rhythmbox] Automake,argh

Matthias Clasen mclasen at fedoraproject.org
Wed Jan 16 23:23:24 UTC 2013


commit 5811395a4e3c5878294982ffa8eefeea6bd6ee7f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Jan 16 18:22:55 2013 -0500

    Automake,argh

 automake-argh.patch |   12 ++++++++++++
 rhythmbox.spec      |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/automake-argh.patch b/automake-argh.patch
new file mode 100644
index 0000000..37ad85c
--- /dev/null
+++ b/automake-argh.patch
@@ -0,0 +1,12 @@
+diff -up rhythmbox-2.98/configure.ac.automak rhythmbox-2.98/configure.ac
+--- rhythmbox-2.98/configure.ac.automak	2013-01-16 18:19:37.915616383 -0500
++++ rhythmbox-2.98/configure.ac	2013-01-16 18:21:55.050611481 -0500
+@@ -4,7 +4,7 @@ AC_INIT([rhythmbox],
+ 	[https://bugzilla.gnome.org/enter_bug.cgi?product=rhythmbox])
+ AC_CONFIG_SRCDIR(rhythmbox.pc.in)
+ AC_CONFIG_MACRO_DIR(macros)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip])
+ 
+ AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")
diff --git a/rhythmbox.spec b/rhythmbox.spec
index f6c303a..0e7b577 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -13,6 +13,8 @@ Source: http://download.gnome.org/sources/rhythmbox/2.98/%{name}-%{version}.tar.
 Patch0: Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=686320
 Patch1: rhythmbox-2.98-xinitthreads.patch
+# automake 1.13, argh
+Patch2: automake-argh.patch
 
 Requires: gtk3 >= 2.91.4
 Requires: gnome-icon-theme-legacy
@@ -96,6 +98,8 @@ a Rhythmbox plugin.
 %setup -q
 %patch0 -p1 -b .context_plugin_webkit
 %patch1 -p1 -b .xinitthreads
+%patch2 -p1 -b .automak
+
 autoreconf -fi
 
 %build


More information about the scm-commits mailing list