[spandsp] use of brackets confuses autotools (#691039)
Rex Dieter
rdieter at fedoraproject.org
Tue Dec 27 21:34:14 UTC 2011
commit b97691be8aa4e8153ed45c6f8351bedf72960c4f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Dec 27 15:34:14 2011 -0600
use of brackets confuses autotools (#691039)
spandsp-0.0.6-brackets.patch | 12 ++++++++++++
spandsp-0.0.6-brackets_am.patch | 12 ++++++++++++
spandsp.spec | 13 ++++++++++++-
3 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/spandsp-0.0.6-brackets.patch b/spandsp-0.0.6-brackets.patch
new file mode 100644
index 0000000..2affad6
--- /dev/null
+++ b/spandsp-0.0.6-brackets.patch
@@ -0,0 +1,12 @@
+diff -up spandsp-0.0.6/configure.brackets spandsp-0.0.6/configure
+--- spandsp-0.0.6/configure.brackets 2011-01-22 01:49:54.000000000 -0600
++++ spandsp-0.0.6/configure 2011-12-27 15:29:07.281452488 -0600
+@@ -28574,7 +28574,7 @@ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_RealFile'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_RealFile'}'`" >&6
+ if test `eval echo '${'$as_ac_RealFile'}'` = yes; then
+- libdir='$(exec_prefix)/lib64'
++ libdir='${exec_prefix}/lib64'
+ fi
+
+ echo "$as_me:$LINENO: checking for /usr/X11R6/lib64" >&5
diff --git a/spandsp-0.0.6-brackets_am.patch b/spandsp-0.0.6-brackets_am.patch
new file mode 100644
index 0000000..bd76681
--- /dev/null
+++ b/spandsp-0.0.6-brackets_am.patch
@@ -0,0 +1,12 @@
+diff -up spandsp-0.0.6/configure.ac.brackets spandsp-0.0.6/configure.ac
+--- spandsp-0.0.6/configure.ac.brackets 2010-08-01 02:01:22.000000000 -0500
++++ spandsp-0.0.6/configure.ac 2011-12-27 15:28:10.251165461 -0600
+@@ -258,7 +258,7 @@ then
+ case "${host}" in
+ x86_64-*)
+ # X86_64 Linux machines may have both 64 bit and 32 bit libraries. We need to choose the right set
+- AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
++ AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='${exec_prefix}/lib64')
+ AX_CHECK_REAL_FILE([/usr/X11R6/lib64], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib64"], AC_CHECK_FILE([/usr/X11R6/lib], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib"]))
+ # The very oldest AMD 64 bit chips support SSE2, SSE and MMX
+ enable_sse2="yes"
diff --git a/spandsp.spec b/spandsp.spec
index 8bd54b3..ffa0346 100644
--- a/spandsp.spec
+++ b/spandsp.spec
@@ -3,13 +3,19 @@
Summary: A DSP library for telephony
Name: spandsp
Version: 0.0.6
-Release: 0.4%{?pre:.pre%{pre}}%{?dist}
+Release: 0.5%{?pre:.pre%{pre}}%{?dist}
License: LGPLv2 and GPLv2
Group: System Environment/Libraries
URL: http://www.soft-switch.org/
Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+# touch configure only
+Patch50: spandsp-0.0.6-brackets.patch
+# more upstreamable touching-configure.ac version
+Patch51: spandsp-0.0.6-brackets_am.patch
+
BuildRequires: libtiff-devel%{?_isa}
BuildRequires: libxml2-devel%{?_isa}
BuildRequires: audiofile-devel%{?_isa}
@@ -46,6 +52,8 @@ SpanDSP API documentation.
%prep
%setup -q
+%patch50 -p1 -b .brackets
+
%{__sed} -i 's/\r//' ChangeLog
%{__sed} -i 's/\r//' AUTHORS
%{__sed} -i 's/\r//' DueDiligence
@@ -88,6 +96,9 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog
+* Tue Dec 27 2011 Rex Dieter <rdieter at fedoraproject.org> 0.0.6-0.5.pre18
+- use of brackets confuses autotools (#691039)
+
* Wed Feb 9 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.6-0.4.pre18
- 0.0.6pre18
More information about the scm-commits
mailing list