From 7c6f9f90b55b890fdf25839caf5bdc26d7bbb4c0ee6d944a9a8b7ac4898d1c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 29 May 2012 16:34:10 +0000 Subject: [PATCH] Accepting request 122768 from home:puzel:branches:multimedia:libs - fix build with automake-12.1 OBS-URL: https://build.opensuse.org/request/show/122768 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=18 --- automake-1.12.patch | 13 +++++++++++++ libcaca.changes | 5 +++++ libcaca.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch new file mode 100644 index 0000000..110d947 --- /dev/null +++ b/automake-1.12.patch @@ -0,0 +1,13 @@ +Index: libcaca-0.99.beta18/bootstrap +=================================================================== +--- libcaca-0.99.beta18.orig/bootstrap ++++ libcaca-0.99.beta18/bootstrap +@@ -36,7 +36,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL + + # Check for automake + amvers="no" +-for v in 11 10 9 8 7 6 5; do ++for v in 12 11 10 9 8 7 6 5; do + if automake-1.${v} --version >/dev/null 2>&1; then + amvers="-1.${v}" + break diff --git a/libcaca.changes b/libcaca.changes index afe4c0a..ab46000 100644 --- a/libcaca.changes +++ b/libcaca.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 29 14:00:53 UTC 2012 - puzel@suse.com + +- fix build with automake-12.1 + ------------------------------------------------------------------- Tue May 29 10:33:39 UTC 2012 - jengelh@inai.de diff --git a/libcaca.spec b/libcaca.spec index 4974bab..c631a1f 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -52,6 +52,7 @@ Patch4: libcaca-ruby_am_cflags.patch Patch5: libcaca-ruby_vendor_install.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch9: caca-no-build-date.patch +Patch10: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch} %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver} @@ -181,6 +182,7 @@ chmod 0644 %{S:0} %patch7 %patch9 %patch1 +%patch10 -p1 %build autoreconf -fi