Hello community,
here is the log from the commit of package libcaca for openSUSE:Factory checked
in at 2012-05-31 17:06:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcaca (Old)
and /work/SRC/openSUSE:Factory/.libcaca.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcaca", Maintainer is "p...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcaca/libcaca.changes 2012-05-16
21:35:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libcaca.new/libcaca.changes 2012-05-31
17:06:07.000000000 +0200
@@ -1,0 +2,11 @@
+Tue May 29 14:00:53 UTC 2012 - pu...@suse.com
+
+- fix build with automake-12.1
+
+-------------------------------------------------------------------
+Tue May 29 10:33:39 UTC 2012 - jeng...@inai.de
+
+- Use autoreconf instead of ./bootstrap since (a) that works,
+ (b) avoids the inflexible handcrafted automake version check
+
+-------------------------------------------------------------------
New:
----
automake-1.12.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcaca.spec ++++++
--- /var/tmp/diff_new_pack.x1keaO/_old 2012-05-31 17:06:10.000000000 +0200
+++ /var/tmp/diff_new_pack.x1keaO/_new 2012-05-31 17:06:10.000000000 +0200
@@ -52,6 +52,7 @@
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 @@
%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 @@
%else
--enable-java=no
%endif
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
%install
%makeinstall
++++++ automake-1.12.patch ++++++
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
