- updated to 2.7.2 (note: new libecasound soname)

- updated link,acam patches

Changed files:
    ecasound-acam.patch -> 1.3
    ecasound-link.patch -> 1.10
    ecasound.spec -> 1.109

diff --git a/ecasound-acam.patch b/ecasound-acam.patch
index e4aea0c08423454e8706a18f0f5f8f725e60dcc1..98ae8df4161812d9955e335ce14b85ba9e06e884 100644 (file)
--- a/ecasound-acam.patch
+++ b/ecasound-acam.patch
@@ -1,5 +1,5 @@
---- ecasound-2.6.0/pyecasound/Makefile.am.orig 2009-01-18 10:35:50.000000000 +0100
-+++ ecasound-2.6.0/pyecasound/Makefile.am      2009-06-15 12:28:42.320618248 +0200
+--- ecasound-2.7.2/pyecasound/Makefile.am.orig 2009-04-19 19:10:40.000000000 +0200
++++ ecasound-2.7.2/pyecasound/Makefile.am      2011-01-14 17:40:20.430361617 +0100
 @@ -27,10 +27,6 @@
                                $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \
                                $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
@@ -22,7 +22,7 @@
  endif
  
 -libpyecasound_la_SOURCES      = pyecasound.c
-+pyecasound_la_SOURCES         = pyecasound.c
++pyecasound_la_SOURCES = pyecasound.c
  
  # libtool options to build for dlopen
 -libpyecasound_la_LDFLAGS        = -avoid-version -export-dynamic
@@ -33,7 +33,7 @@
 -pyecasound.so: pyecasound.lo
 -      $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) ${libpyecasound_la_LDFLAGS} -shared -nostartfiles -o pyecasound.so pyecasound.lo $(ecasoundc_libs)
 -endif
-+pyecasound_la_LDFLAGS = -module -avoid-version -export-dynamic
++pyecasound_la_LDFLAGS        = -module -avoid-version -export-dynamic
 +pyecasound_la_LIBADD = $(top_builddir)/libecasoundc/libecasoundc.la
  
  # ----------------------------------------------------------------------
@@ -58,6 +58,6 @@
  uninstall-local:
 -      rm -f $(pyecasound_uninstall_list1) $(pyecasound_uninstall_list2)
 +      rm -f $(pyecasound_uninstall_list1)
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
+       rmdir $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) || echo "Skipping non-empty directory"
  else
  uninstall-local:

diff --git a/ecasound-link.patch b/ecasound-link.patch
index 8aa520346459d1fde917d2b6613fbb12b35cb57d..9965db688e7b8787eea81866408c68702d2c1f31 100644 (file)
--- a/ecasound-link.patch
+++ b/ecasound-link.patch
@@ -16,19 +16,19 @@
  libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
  
  noinst_HEADERS = $(kvutil_headers)
---- ecasound-2.4.6.1/libecasound/Makefile.am.orig      2007-04-29 18:04:23.000000000 +0200
-+++ ecasound-2.4.6.1/libecasound/Makefile.am   2007-08-30 20:06:48.441627937 +0200
-@@ -339,8 +339,8 @@
+--- ecasound-2.7.2/libecasound/Makefile.am.orig        2009-04-19 20:04:27.000000000 +0200
++++ ecasound-2.7.2/libecasound/Makefile.am     2011-01-14 17:36:27.810364132 +0100
+@@ -363,8 +363,8 @@
+ 
  libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
  libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
- libecasound_la_CFLAGS =  $(ECA_S_EXTRA_CFLAGS)
 -libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
 -libecasound_la_LIBADD = $(eca_libadd)
 +libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
 +libecasound_la_LIBADD = $(eca_libadd) ../kvutils/libkvutils.la
- libecasound_debug_la_CFLAGS = $(libecasound_la_CFLAGS)
  libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
  libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
+ 
 --- ecasound-2.3.4/libecasound/plugins/Makefile.am.orig        2004-04-21 21:50:47.000000000 +0200
 +++ ecasound-2.3.4/libecasound/plugins/Makefile.am     2004-11-06 22:52:59.828417456 +0100
 @@ -88,7 +88,7 @@

diff --git a/ecasound.spec b/ecasound.spec
index d72788416e6d4055c1ec87e85ab779206ca0936f..cb5bb018d966f9c738bfb76aeb5c7f3cbaf18892 100644 (file)
--- a/ecasound.spec
+++ b/ecasound.spec
@@ -8,25 +8,29 @@
 Summary:       Software package for multitrack audio processing
 Summary(pl.UTF-8):     Oprogramowanie do wielościeżkowego przetwarzania dźwięku
 Name:          ecasound
-Version:       2.6.0
-Release:       3
+Version:       2.7.2
+Release:       1
 License:       GPL v2+
 Group:         Applications/Sound
 Source0:       http://ecasound.seul.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 41f9445b9a9c0cde141831cb53d1ef8f
+# Source0-md5: 40498ceed9cc7622ee969c427f13921c
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-acam.patch
-URL:           http://ecasound.seul.org/
+URL:           http://www.eca.cx/ecasound/
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:    arts-devel}
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6.1
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
 BuildRequires: ladspa-devel
+BuildRequires: liblo-devel
+BuildRequires: liboil-devel >= 0.3
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel >= 1.0.12
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.4d
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
 BuildRequires: python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: readline-devel >= 5.0
@@ -79,6 +83,8 @@ Requires:     %{name} = %{version}-%{release}
 %{?with_alsa:Requires: alsa-lib-devel}
 %{?with_arts:Requires: arts-devel}
 %{?with_jack:Requires: jack-audio-connection-kit-devel}
+Requires:      liblo-devel
+Requires:      liboil-devel >= 0.3
 Requires:      libsamplerate-devel
 Requires:      libsndfile-devel
 Requires:      libstdc++-devel
@@ -182,10 +188,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS NEWS README TODO
+# COPYING is licensing note, not GPL/LGPL text
+%doc AUTHORS BUGS COPYING NEWS README TODO
 %attr(755,root,root) %{_bindir}/eca*
 %attr(755,root,root) %{_libdir}/libecasound.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libecasound.so.20
+%attr(755,root,root) %ghost %{_libdir}/libecasound.so.22
 %attr(755,root,root) %{_libdir}/libecasoundc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libecasoundc.so.1
 %attr(755,root,root) %{_libdir}/libkvutils.so.*.*.*