[packages/solfege] Version: 3.23.4

Wed Dec 14 13:08:42 CET 2016

commit 46a1c8d35ef252a248839737ea1a9abdc4c9168d
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Wed Dec 14 13:08:16 2016 +0100

    Version: 3.23.4

 solfege-desktop.patch         | 13 +++++----
 solfege-fix.patch             | 22 +++++++++-------
 solfege-python.patch          | 18 +++++++++++++
 solfege-sequencer_tempo.patch | 12 +++++++++
 solfege.spec                  | 61 ++++++++++++++++++-------------------------
 5 files changed, 73 insertions(+), 53 deletions(-)
---

diff --git a/solfege.spec b/solfege.spec
index 8ea6d2c..895f857 100644
--- a/solfege.spec
+++ b/solfege.spec
@@ -2,29 +2,31 @@ Summary:	Eartraining program for GNOME
 Summary(de.UTF-8):	Gehörbildungssoftware für GNOME
 Summary(pl.UTF-8):	Program do ćwiczenia słuchu dla GNOME
 Name:		solfege
-Version:	3.14.9
-Release:	4
-License:	GPL v2+
+Version:	3.23.4
+Release:	1
+License:	GPL v3
 Group:		X11/Applications/Sound
-Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
-# Source0-md5:	487c9df5caae642f1f0758758717e7a8
+Source0:	ftp://alpha.gnu.org/gnu/solfege/%{name}-%{version}.tar.gz
+# Source0-md5:	7f3044982d188024d0318dccb4bc58d4
 Patch0:		%{name}-fix.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-paths.patch
-URL:		http://solfege.sourceforge.net/
+Patch3:		%{name}-python.patch
+Patch4:		%{name}-sequencer_tempo.patch
+URL:		https://www.gnu.org/software/solfege/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-tools
 BuildRequires:	gnome-doc-utils
+BuildRequires:	lilypond
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.17
-BuildRequires:	python-devel >= 1:2.3
-BuildRequires:	python-pygtk-devel >= 2.6.0
+BuildRequires:	python3-devel
+BuildRequires:	python3-pygobject3
 BuildRequires:	rpm-pythonprov
 BuildRequires:	swig-python >= 1.3.25
 BuildRequires:	texinfo
 # xml2po >= 0.4 - required only on en manual changes
-Requires:	python-pygtk-gtk >= 2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,6 +68,8 @@ kompletnego narzędzia. Ale ma nadzieję, że komuś się przyda.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal}
@@ -76,8 +80,8 @@ kompletnego narzędzia. Ale ma nadzieję, że komuś się przyda.
 	LILYPOND=%{_bindir}/lilypond \
 	BZR=%{_bindir}/bzr \
 	GS=%{_bindir}/gs \
-	PYTHON=/usr/bin/python \
-	--enable-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl
+	PYTHON=%{__python3} \
+        --enable-docbook-stylesheet=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl
 
 %{__make}
 
@@ -87,16 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# _solfege_c_midi.so file must be in the same directory where solfege_c_midi.py
-# and it must be in %{_libdir} because .so is platform dependant
-mv $RPM_BUILD_ROOT{%{_datadir},%{_libdir}}/%{name}/soundcard
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/{,soundcard/}_solfege_c_midi.so
-
-%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
-find $RPM_BUILD_ROOT%{_datadir}/solfege -name '*.py' | xargs rm -f
-%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
-find $RPM_BUILD_ROOT%{_libdir} -name '*.py' | xargs rm -f
-
 %find_lang %{name}
 
 %clean
@@ -104,19 +98,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ README changelog
+%doc AUTHORS FAQ README changelog*
 %attr(755,root,root) %{_bindir}/solfege
 %dir %{_libdir}/solfege
-%dir %{_libdir}/solfege/soundcard
-%attr(755,root,root) %{_libdir}/solfege/soundcard/_solfege_c_midi.so
-%dir %{_libdir}/solfege/soundcard/*.pyc
+%attr(755,root,root) %{_libdir}/solfege/_solfege_c_midi.so
 %dir %{_datadir}/solfege
-%{_datadir}/solfege/example-lesson-files
+%{_datadir}/solfege/solfege
+%{_datadir}/solfege/exercises
 %{_datadir}/solfege/feta
 %{_datadir}/solfege/graphics
 %dir %{_datadir}/solfege/help
 %{_datadir}/solfege/help/style.css
 %{_datadir}/solfege/help/C
+%lang(de) %{_datadir}/solfege/help/de
+%lang(eo) %{_datadir}/solfege/help/eo
+%lang(es) %{_datadir}/solfege/help/es
+%lang(et) %{_datadir}/solfege/help/et
 %lang(fr) %{_datadir}/solfege/help/fr
 %lang(gl) %{_datadir}/solfege/help/gl
 %lang(nb) %{_datadir}/solfege/help/nb
@@ -126,16 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_datadir}/solfege/help/ru
 %lang(tr) %{_datadir}/solfege/help/tr
 %{_datadir}/solfege/default.config
-%{_datadir}/solfege/hash-bug-workaround
-%{_datadir}/solfege/learningtrees
-%{_datadir}/solfege/lesson-files
-%{_datadir}/solfege/mpd
-%{_datadir}/solfege/regression-lesson-files
-%{_datadir}/solfege/solfege.gtkrc
-%{_datadir}/solfege/src
-%{_datadir}/solfege/themes
 %{_datadir}/solfege/*.xml
+%{_datadir}/solfege/solfege.css
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/solfege*
-%{_pixmapsdir}/solfege.png
+%{_pixmapsdir}/solfege.svg
 %{_desktopdir}/solfege.desktop
-%{_mandir}/man1/solfege.1*
diff --git a/solfege-desktop.patch b/solfege-desktop.patch
index 3852c13..c094f6b 100644
--- a/solfege-desktop.patch
+++ b/solfege-desktop.patch
@@ -1,13 +1,12 @@
---- solfege-3.12.0/solfege.desktop.orig	2008-11-08 11:35:31.000000000 +0100
-+++ solfege-3.12.0/solfege.desktop	2008-11-16 10:16:59.984022119 +0100
-@@ -1,7 +1,9 @@
- [Desktop Entry]
+diff -dur solfege-3.22.2.orig/solfege.desktop solfege-3.22.2/solfege.desktop
+--- solfege-3.22.2.orig/solfege.desktop	2013-10-05 22:57:48.000000000 +0200
++++ solfege-3.22.2/solfege.desktop	2016-12-13 15:07:01.000000000 +0100
+@@ -2,6 +2,8 @@
  Name=GNU Solfege
+ GenericName=Ear training
+ GenericName[de]=Gehörtraining
 +Comment=Solfege eartraining program
 +Comment[pl]=Program do ćwiczenia słuchu Solfege
  Exec=solfege
  Terminal=false
  Type=Application
- Icon=solfege.png
--Categories=GNOME;Application;AudioVideo;Audio;Education;
-+Categories=GTK;GNOME;AudioVideo;Audio;Education;
diff --git a/solfege-fix.patch b/solfege-fix.patch
index 9afa76b..4c75e74 100644
--- a/solfege-fix.patch
+++ b/solfege-fix.patch
@@ -1,6 +1,7 @@
---- solfege-3.6.4/configure.ac.orig	2006-12-08 11:16:31.000000000 +0100
-+++ solfege-3.6.4/configure.ac	2006-12-10 21:33:51.459779366 +0100
-@@ -126,9 +126,9 @@
+diff -dur -x '*.orig' solfege-3.22.2.orig/configure.ac solfege-3.22.2/configure.ac
+--- solfege-3.22.2.orig/configure.ac	2013-10-05 22:57:48.000000000 +0200
++++ solfege-3.22.2/configure.ac	2016-12-13 15:08:20.000000000 +0100
+@@ -144,9 +144,9 @@
  
  dnl Checks for libraries.
  if test "x$ENABLE_TUNER" = xyes; then
@@ -12,14 +13,15 @@
          LIBS="$LIBS -lfftw -lrfftw"], ,-lfftw)
  fi
  
---- solfege-3.6.4/soundcard/Makefile.orig	2006-12-08 11:16:31.000000000 +0100
-+++ solfege-3.6.4/soundcard/Makefile	2006-12-10 22:01:39.994863763 +0100
-@@ -25,7 +25,7 @@
+diff -dur solfege-3.23.4.orig/solfege/soundcard/Makefile solfege-3.23.4/solfege/soundcard/Makefile
+--- solfege-3.23.4.orig/solfege/soundcard/Makefile	2016-06-24 22:18:29.000000000 +0200
++++ solfege-3.23.4/solfege/soundcard/Makefile	2016-12-13 15:30:59.000000000 +0100
+@@ -23,7 +23,7 @@
+ 	solfege/soundcard/winmidi.dsp solfege/soundcard/winmidi.dsw solfege/soundcard/winmidi.def \
+ 	$(wildcard solfege/soundcard/tests/*.py)
  
- easy-dist-files += soundcard/solfege_c_midi_wrap.c
- 
--CFLAGS:=$(CFLAGS) -I/usr/src/linux/include -Wall -pedantic -fPIC
-+CFLAGS:=$(CFLAGS) -Wall -pedantic -fPIC
+-CFLAGS:=$(CFLAGS) -I/usr/src/linux/include -Wall -pedantic -fPIC -I.
++CFLAGS:=$(CFLAGS) -Wall -pedantic -fPIC -I.
  CC:=$(CC) $(CFLAGS) -DHAVE_CONFIG_H 
  
  ifeq ($(ENABLE_OSS_SOUND),yes)
diff --git a/solfege-python.patch b/solfege-python.patch
new file mode 100644
index 0000000..17489f7
--- /dev/null
+++ b/solfege-python.patch
@@ -0,0 +1,18 @@
+diff -dur solfege-3.23.4.orig/acinclude.m4 solfege-3.23.4/acinclude.m4
+--- solfege-3.23.4.orig/acinclude.m4	2016-06-24 22:18:29.000000000 +0200
++++ solfege-3.23.4/acinclude.m4	2016-12-13 15:24:13.000000000 +0100
+@@ -8,13 +8,7 @@
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
+ py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
+-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-if test "x$MSYSTEM" = "xMINGW32"; then
+-  PYTHON_INCLUDES="-I${py_prefix}/include"
+-fi
+-if test "$py_prefix" != "$py_exec_prefix"; then
+-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-fi
++PYTHON_INCLUDES=`python3-config --includes`
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
diff --git a/solfege-sequencer_tempo.patch b/solfege-sequencer_tempo.patch
new file mode 100644
index 0000000..25f599f
--- /dev/null
+++ b/solfege-sequencer_tempo.patch
@@ -0,0 +1,12 @@
+diff -dur solfege-3.23.4.orig/solfege/soundcard/oss_sequencer2.py solfege-3.23.4/solfege/soundcard/oss_sequencer2.py
+--- solfege-3.23.4.orig/solfege/soundcard/oss_sequencer2.py	2016-06-24 22:18:29.000000000 +0200
++++ solfege-3.23.4/solfege/soundcard/oss_sequencer2.py	2016-12-14 12:56:22.000000000 +0100
+@@ -56,7 +56,7 @@
+                 t = e[1] * 4 / e[2]
+                 if t < 256:
+                     m.sndctl_tmr_timebase(96)
+-                    m.sndctl_tmr_tempo(t)
++                    m.sndctl_tmr_tempo(int(t))
+                 else:
+                     if t > 511:
+                         logging.debug("devmusicsynth.py: warning: bpm > 511")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/solfege.git/commitdiff/46a1c8d35ef252a248839737ea1a9abdc4c9168d

