From e203012dc2d53e0e7a45c4ec955e890d4522aa1d5dc9d6e5dc5c2c634348b2e7 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Thu, 9 Feb 2012 14:57:10 +0000 Subject: [PATCH] Obviously it had to fail in every distro but the tested one... Readding the patch for <=12.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=25 --- ladspa.changes | 2 +- ladspa.spec | 9 +++++++++ swh-configure-2.65.patch | 30 ++++++++++++++++++++++++++++++ swh-configure.patch | 30 ++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 swh-configure-2.65.patch create mode 100644 swh-configure.patch diff --git a/ladspa.changes b/ladspa.changes index 763eede..3a9aea1 100644 --- a/ladspa.changes +++ b/ladspa.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Feb 9 14:20:40 UTC 2012 - reddwarf@opensuse.org -- Remove swh-configure-2.65.patch, which broke Factory build +- Remove swh-configure-2.65.patch for >12.1 ------------------------------------------------------------------- Sun Nov 13 09:12:07 UTC 2011 - coolo@suse.com diff --git a/ladspa.spec b/ladspa.spec index c78ac78..603eb54 100644 --- a/ladspa.spec +++ b/ladspa.spec @@ -99,6 +99,12 @@ Patch16: pvoc-compile-fix.dif Patch17: swh-0.4.13-gcc4-fix.diff Patch18: sooperlooper-0.93-gcc4-fix.diff Patch20: swh-libblo.dif +# swh-configure.patch changes for >= autoconf-2.65 in openSUSE 11.3 +%if 0%{?suse_version} <= 1120 +Patch21: swh-configure.patch +%else +Patch21: swh-configure-2.65.patch +%endif Patch22: alienwah-compile-fix.diff Patch23: alienwah-float_complex.diff Patch25: pvoc-0.1.10-depend-copts-fix.diff @@ -149,6 +155,9 @@ Authors: touch config.rpath ./autogen.sh --prefix=%{_prefix} %{?suse_update_config:%{suse_update_config -f}} +%if 0%{?suse_version} <= 1210 +%patch21 -p 1 +%endif ) (cd cmt %patch2 diff --git a/swh-configure-2.65.patch b/swh-configure-2.65.patch new file mode 100644 index 0000000..c699674 --- /dev/null +++ b/swh-configure-2.65.patch @@ -0,0 +1,30 @@ +Index: swh-plugins-0.4.15/configure +=================================================================== +--- swh-plugins-0.4.15.orig/configure ++++ swh-plugins-0.4.15/configure +@@ -767,6 +767,7 @@ GMSGFMT + MSGFMT + GETTEXT_MACRO_VERSION + USE_NLS ++MKINSTALLDIRS + CPP + OTOOL64 + OTOOL +@@ -11223,6 +11224,17 @@ fi + + ALL_LINGUAS="en_GB" + ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ case "$ac_aux_dir" in ++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; ++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; ++ esac ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. diff --git a/swh-configure.patch b/swh-configure.patch new file mode 100644 index 0000000..22cc156 --- /dev/null +++ b/swh-configure.patch @@ -0,0 +1,30 @@ +Index: swh-plugins-0.4.15/configure +=================================================================== +--- swh-plugins-0.4.15.orig/configure ++++ swh-plugins-0.4.15/configure +@@ -811,6 +811,7 @@ GMSGFMT + MSGFMT + GETTEXT_MACRO_VERSION + USE_NLS ++MKINSTALLDIRS + CPP + OTOOL64 + OTOOL +@@ -12121,6 +12122,17 @@ fi + + ALL_LINGUAS="en_GB" + ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ case "$ac_aux_dir" in ++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; ++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; ++ esac ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ + { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given.