From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 20 Nov 2003 21:16:12 +0000 (+0000)
Subject: - updated to 2.3.1, updated link patch
X-Git-Tag: auto/ac/ecasound-2_3_2-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fecasound.git;a=commitdiff_plain;h=f16f7ba74cc2e15b281bed33e0a0751c5ca8e7bc

- updated to 2.3.1, updated link patch

Changed files:
    ecasound-link.patch -> 1.6
    ecasound.spec -> 1.75
---

diff --git a/ecasound-link.patch b/ecasound-link.patch
index 8d8b43d..00e2e19 100644
--- a/ecasound-link.patch
+++ b/ecasound-link.patch
@@ -1,20 +1,3 @@
---- ecasound-2.3.0/ecasound/Makefile.am.orig	2003-05-30 02:15:49.000000000 +0200
-+++ ecasound-2.3.0/ecasound/Makefile.am	2003-09-07 14:39:50.724992384 +0200
-@@ -44,12 +44,12 @@
- if ECA_AM_SYSTEM_READLINE
- ecasound_LDFLAGS = -export-dynamic
- ecasound_LDADD = $(termcap_library) \
--		$(readline_library} -lreadline -lhistory \
-+		$(readline_library) -lreadline -lhistory \
- 		$(top_builddir)/libecasound/libecasound.la \
- 		$(top_builddir)/kvutils/libkvutils.la
- ecasound_debug_LDFLAGS = $(ecasound_LDFLAGS)
- ecasound_debug_LDADD = $(termcap_library) \
--		$(readline_library} -lreadline -lhistory \
-+		$(readline_library) -lreadline -lhistory \
- 	 	$(top_builddir)/libecasound/libecasound_debug.la \
- 		$(top_builddir)/kvutils/libkvutils_debug.la
- 
 --- ecasound-2.3.0.orig/kvutils/Makefile.am	Tue Nov  5 02:05:17 2002
 +++ ecasound-2.3.0/kvutils/Makefile.am	Sat Feb 15 11:07:24 2003
 @@ -41,13 +41,13 @@
@@ -73,14 +56,3 @@ diff -Nur ecasound-2.2.3.orig/libecasound/plugins/Makefile.am ecasound-2.2.3/lib
  endif
  
  INCLUDES = -I$(srcdir)
---- ecasound-2.2.3/pyecasound/Makefile.am.orig	2003-04-02 21:37:45.000000000 +0200
-+++ ecasound-2.2.3/pyecasound/Makefile.am	2003-05-10 20:48:34.000000000 +0200
-@@ -50,7 +50,7 @@
- all: pyecasound.so
- 
- pyecasound.so: pyecasound.lo
--	$(CC) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo
-+	$(LINK) -o pyecasound.so -shared -nostartfiles $(libpyecasound_la_LDFLAGS) pyecasound.lo $(top_builddir)/libecasoundc/ecasoundc_sa.lo
- endif
- 
- # ----------------------------------------------------------------------
diff --git a/ecasound.spec b/ecasound.spec
index 5eaa4fd..cd025f9 100644
--- a/ecasound.spec
+++ b/ecasound.spec
@@ -1,20 +1,22 @@
 #
 # Conditional build:
-%{?_without_alsa:%global _without_jack 1}
 %bcond_without	alsa		# without ALSA support (implies without JACK)
 %bcond_without	jack		# without JACK support
 %bcond_with	arts		# with aRts support
 #
+%if %{without alsa}
+%undefine	with_jack
+%endif
 %include	/usr/lib/rpm/macros.python
 Summary:	Software package for multitrack audio processing
 Summary(pl):	Oprogramowanie do wielo¶cie¿kowego przetwarzania d¼wiêku
 Name:		ecasound
-Version:	2.3.0
+Version:	2.3.1
 Release:	1
 License:	GPL
 Group:		Applications/Sound
 Source0:	http://ecasound.seul.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	fb440a68466c8bd6f7bc8a14adf46ef7
+# Source0-md5:	03729504e65bb1110a6dc7ff19ffa01c
 Patch0:		%{name}-link.patch
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	arts-devel}
@@ -127,6 +129,7 @@ CXXFLAGS="%{rpmcflags} -D_REENTRANT %{!?debug:-DNDEBUG} -I/usr/include/ncurses"
 	%{!?with_jack:--disable-jack} \
 	%{?with_alsa:--disable-oss} \
 	--enable-samplerate \
+	--enable-shared \
 	--enable-sys-readline \
 	--enable-pyecasound \
 	--with-largefile \