- 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 8d8b43db9922ed232c65d1b9c3cf82e923ea93de..00e2e196c4572227b7ff04035994721a683e1685 100644 (file)
--- 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 @@
 --- 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)
  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 5eaa4fdb50de496cbfd939c69c76a4f030f23c74..cd025f9977860b416d83deff6b4636d9ae489c29 100644 (file)
--- a/ecasound.spec
+++ b/ecasound.spec
@@ -1,20 +1,22 @@
 #
 # Conditional build:
 #
 # 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
 #
 %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
 %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
 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}
 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 \
        %{!?with_jack:--disable-jack} \
        %{?with_alsa:--disable-oss} \
        --enable-samplerate \

+       --enable-shared \

        --enable-sys-readline \
        --enable-pyecasound \
        --with-largefile \
        --enable-sys-readline \
        --enable-pyecasound \
        --with-largefile \