- Remove swh-configure-2.65.patch, which broke Factory build

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=24

ladspa-devel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ladspa-devel
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Name:           ladspa-devel
 Summary:        Include Files mandatory for Development
 Version:        1.13
 Release:        6
-License:        LGPLv2.1+
+License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Source:         ladspa_sdk_1.13.tar.bz2
 Url:            http://www.ladspa.org/

ladspa.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  9 14:20:40 UTC 2012 - reddwarf@opensuse.org
+
+- Remove swh-configure-2.65.patch, which broke Factory build
+
 -------------------------------------------------------------------
 Sun Nov 13 09:12:07 UTC 2011 - coolo@suse.com
 

ladspa.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ladspa
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@ BuildRequires:  libtool
 Summary:        The Linux Audio Developer's Simple Plug-In API
 Version:        1.13
 Release:        9
-License:        LGPLv2.1+
+License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Sound/Utilities
 AutoReq:        on
 Autoprov:       off
@@ -99,12 +99,6 @@ 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
@@ -155,7 +149,6 @@ Authors:
 touch config.rpath
 ./autogen.sh --prefix=%{_prefix}
 %{?suse_update_config:%{suse_update_config -f}}
-%patch21 -p 1
 )
 (cd cmt
 %patch2

swh-configure-2.65.patch

@@ -1,30 +0,0 @@
-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.

swh-configure.patch

@@ -1,30 +0,0 @@
-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.