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
This commit is contained in:
Ismail Dönmez 2012-05-29 16:34:10 +00:00 committed by Git OBS Bridge
parent 64d8129499
commit 7c6f9f90b5
3 changed files with 20 additions and 0 deletions

13
automake-1.12.patch Normal file
View File

@ -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

View File

@ -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

View File

@ -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