pool/libcaca
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 122800 from multimedia:libs

Browse Source 
- fix build with automake-12.1 (forwarded request 122768 from puzel)

OBS-URL: https://build.opensuse.org/request/show/122800
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcaca?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2012-05-31 15:06:05 +00:00 committed by Git OBS Bridge
commit 4c21976e28
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

11
libcaca.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- Use autoreconf instead of ./bootstrap since (a) that works,
(b) avoids the inflexible handcrafted automake version check
-------------------------------------------------------------------
Mon May 14 09:29:06 UTC 2012 - coolo@suse.com

10
libcaca.spec
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,15 +182,12 @@ chmod 0644 %{S:0}
%patch7
%patch9
%patch1
%patch10 -p1
%build
find ./ -name Makefile.in -delete
rm configure
#export LIBTOOL=/usr/bin/libtool
autoreconf -fi
export CFLAGS="$CFLAGS %{optflags} -I../caca/"
export CXXFLAGS="$CXXFLAGS %{optflags}"
./bootstrap
#autoreconf -fiv
%configure --with-pic \
--program-prefix="%{?_program_prefix}" \
--enable-slang \
@ -209,7 +207,7 @@ export CXXFLAGS="$CXXFLAGS %{optflags}"
%else
--enable-java=no
%endif
%{__make} %{?jobs:-j%jobs}
make %{?_smp_mflags}
%install
%makeinstall