Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

ecasound.changes Changed

ecasound.spec Changed

@@ -5,21 +5,23 @@
 #
 # Please submit bugfixes or comments to packman@links2linux.de
 
-%define ruby_sitedir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%define ruby_sitedir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 
 %{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           ecasound
 Summary:        Multitrack audio processing tool
-Version:        2.8.1
+Version:        2.9.1
 Release:        0.pm.1
-License:        GNU General Public License version 2 or later (GPLv2 or later)
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            http://ecasound.seul.org/
 # http://ecasound.seul.org/download/ecasound-%{version}.tar.gz
 Source:         ecasound-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM incorrect-fsf-address.patch avvissu@yandex.ru -- Fix wrong fsf address
+Patch0:         incorrect-fsf-address.patch
 BuildRequires:  alsa-devel
 BuildRequires:  arts-devel
 BuildRequires:  audiofile-devel
@@ -78,11 +80,7 @@
 Summary:        Python Bindings to the Ecasound Control Interface
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
-%if %suse_version >= 1110
-Requires:       python-base >= %{py_ver}
-%else
 Requires:       python >= %{py_ver}
-%endif
 Provides:       pyecasound = 2.4.5
 Obsoletes:      pyecasound < 2.4.5
 
@@ -99,7 +97,7 @@
 Ruby bindings to the Ecasound control interface.
 
 %package doc
-Summary:        User documentation for the Ecasound control interface
+Summary:        Documentation to the Ecasound Control Interface
 Group:          Documentation/HTML
 Requires:       %{name} = %{version}
 
@@ -108,12 +106,7 @@
 
 %prep
 %setup -q
-
-%if 0%{suse_version} == 1100
-%__sed -i -e 's|ncurses/term.h|ncursesw/term.h|g' %{name}/eca-curses.cpp
-%__sed -i -e 's|ncurses/term.h|ncursesw/term.h|g' %{name}/textdebug.cpp
-%__sed -i -e 's|ncurses/term.h|ncursesw/term.h|g' ecatools/ecasignalview.cpp
-%endif
+%patch0 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
@@ -131,11 +124,11 @@
 %__make %{?_smp_flags}
 
 %install
-%makeinstall
+%makeinstall ECA_S_RUBY_SITEDIR="%{ruby_sitedir}"
 
 # clean ups
 find Documentation -name 'Makefile*' | xargs %__rm
-find examples -name 'Makefile*'      | xargs %__rm
+find examples -name 'Makefile*' -o -name 'ecatrimsilence*' | xargs %__rm
 %__rm Documentation/*.1
 %__rm %{buildroot}%{_libdir}/lib*.la
 #%__rm %{buildroot}%{_libdir}/lib*.a
@@ -165,7 +158,7 @@
 %config %{_datadir}/%{name}/ecasoundrc
 %config %{_datadir}/%{name}/generic_oscillators
 %config %{_datadir}/%{name}/effect_presets
-%doc %{_mandir}/*/*
+%{_mandir}/*/*
 
 %files -n libecasound-devel
 %defattr(-, root, root)
@@ -181,7 +174,6 @@
 %files -n python-ecasound
 %defattr(-,root,root)
 %{python_sitearch}/*.py*
-%{python_sitearch}/*.so
 
 %files -n ruby-ecasound
 %defattr(-,root,root)
@@ -191,4 +183,4 @@
 %defattr(-,root,root)
 %doc Documentation/*
 
-%changelog
+%changelog
\ No newline at end of file

incorrect-fsf-address.patch Added

@@ -0,0 +1,1994 @@
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/COPYING.GPL ecasound-2.9.1/COPYING.GPL
+--- ecasound-2.9.1.orig/COPYING.GPL	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/COPYING.GPL	2014-09-27 03:56:40.812250434 +0300
+@@ -2,7 +2,7 @@
+ 		       Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ 51 Franklin Street, Fifth Floor, Boston,MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/COPYING.LGPL ecasound-2.9.1/COPYING.LGPL
+--- ecasound-2.9.1.orig/COPYING.LGPL	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/COPYING.LGPL	2014-09-27 03:56:28.123249398 +0300
+@@ -2,7 +2,7 @@
+ 		       Version 2.1, February 1999
+ 
+  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ 51 Franklin Street, Fifth Floor, Boston,MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/eca-comhelp.cpp ecasound-2.9.1/ecasound/eca-comhelp.cpp
+--- ecasound-2.9.1.orig/ecasound/eca-comhelp.cpp	2014-01-01 13:21:02.000000000 +0300
++++ ecasound-2.9.1/ecasound/eca-comhelp.cpp	2014-09-27 03:37:43.885157617 +0300
+@@ -17,7 +17,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #include "eca-comhelp.h"
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/eca-curses.cpp ecasound-2.9.1/ecasound/eca-curses.cpp
+--- ecasound-2.9.1.orig/ecasound/eca-curses.cpp	2009-04-11 12:44:06.000000000 +0300
++++ ecasound-2.9.1/ecasound/eca-curses.cpp	2014-09-27 03:37:43.875157617 +0300
+@@ -17,7 +17,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/eca-neteci-server.cpp ecasound-2.9.1/ecasound/eca-neteci-server.cpp
+--- ecasound-2.9.1.orig/ecasound/eca-neteci-server.cpp	2011-04-05 23:36:01.000000000 +0300
++++ ecasound-2.9.1/ecasound/eca-neteci-server.cpp	2014-09-27 03:37:43.882157617 +0300
+@@ -17,7 +17,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #include <cassert>
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/eca-plaintext.cpp ecasound-2.9.1/ecasound/eca-plaintext.cpp
+--- ecasound-2.9.1.orig/ecasound/eca-plaintext.cpp	2011-04-05 22:19:59.000000000 +0300
++++ ecasound-2.9.1/ecasound/eca-plaintext.cpp	2014-09-27 03:37:43.872157616 +0300
+@@ -18,7 +18,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #include <iostream>
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/ecasound.cpp ecasound-2.9.1/ecasound/ecasound.cpp
+--- ecasound-2.9.1.orig/ecasound/ecasound.cpp	2014-01-03 13:27:30.000000000 +0300
++++ ecasound-2.9.1/ecasound/ecasound.cpp	2014-09-27 03:37:43.897157618 +0300
+@@ -17,7 +17,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecasound/textdebug.cpp ecasound-2.9.1/ecasound/textdebug.cpp
+--- ecasound-2.9.1.orig/ecasound/textdebug.cpp	2009-04-20 00:48:25.000000000 +0300
++++ ecasound-2.9.1/ecasound/textdebug.cpp	2014-09-27 03:37:43.900157619 +0300
+@@ -17,7 +17,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecaconvert.cpp ecasound-2.9.1/ecatools/ecaconvert.cpp
+--- ecasound-2.9.1.orig/ecatools/ecaconvert.cpp	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecaconvert.cpp	2014-09-27 03:37:43.932157621 +0300
+@@ -15,7 +15,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecafixdc.cpp ecasound-2.9.1/ecatools/ecafixdc.cpp
+--- ecasound-2.9.1.orig/ecatools/ecafixdc.cpp	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecafixdc.cpp	2014-09-27 03:37:43.910157619 +0300
+@@ -14,7 +14,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecamonitor ecasound-2.9.1/ecatools/ecamonitor
+--- ecasound-2.9.1.orig/ecatools/ecamonitor	2009-04-19 19:37:27.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecamonitor	2014-09-27 03:37:43.938157622 +0300
+@@ -16,7 +16,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ # ------------------------------------------------------------------------
+ 
+ import curses
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecanormalize.cpp ecasound-2.9.1/ecatools/ecanormalize.cpp
+--- ecasound-2.9.1.orig/ecatools/ecanormalize.cpp	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecanormalize.cpp	2014-09-27 03:37:43.935157621 +0300
+@@ -15,7 +15,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecaplay.c ecasound-2.9.1/ecatools/ecaplay.c
+--- ecasound-2.9.1.orig/ecatools/ecaplay.c	2012-04-29 01:39:23.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecaplay.c	2014-09-27 03:37:43.930157621 +0300
+@@ -15,7 +15,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ /**
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecasignalview.cpp ecasound-2.9.1/ecatools/ecasignalview.cpp
+--- ecasound-2.9.1.orig/ecatools/ecasignalview.cpp	2009-02-09 01:41:29.000000000 +0200
++++ ecasound-2.9.1/ecatools/ecasignalview.cpp	2014-09-27 03:37:43.920157620 +0300
+@@ -16,7 +16,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #ifdef HAVE_CONFIG_H
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecasound.el ecasound-2.9.1/ecatools/ecasound.el
+--- ecasound-2.9.1.orig/ecatools/ecasound.el	2012-05-10 23:50:55.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecasound.el	2014-09-27 03:55:02.172242381 +0300
+@@ -18,8 +18,8 @@
+ 
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with GNU Emacs; see the file COPYING.  If not, write to
+-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-;; Boston, MA 02111-1307, USA.
++;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++;; Boston,MA 02110-1301 USA.
+ 
+ ;;; Commentary:
+ 
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/ecatools/ecicpp_helpers.cpp ecasound-2.9.1/ecatools/ecicpp_helpers.cpp
+--- ecasound-2.9.1.orig/ecatools/ecicpp_helpers.cpp	2014-01-01 12:54:51.000000000 +0300
++++ ecasound-2.9.1/ecatools/ecicpp_helpers.cpp	2014-09-27 03:37:43.912157620 +0300
+@@ -14,7 +14,7 @@
+ // 
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ // ------------------------------------------------------------------------
+ 
+ #include <cstdlib>
+diff -U 3 -H -d -r -N -- ecasound-2.9.1.orig/kvutils/kvu_com_line.cpp ecasound-2.9.1/kvutils/kvu_com_line.cpp
+--- ecasound-2.9.1.orig/kvutils/kvu_com_line.cpp	2007-08-25 16:52:26.000000000 +0300
++++ ecasound-2.9.1/kvutils/kvu_com_line.cpp	2014-09-27 03:37:43.996157626 +0300
+@@ -14,7 +14,7 @@
+ //

_service Added

_service:recompress:download_url:ecasound-2.9.1.tar.bz2 Added

ecasound-2.8.1.tar.bz2 Deleted