Hello community, here is the log from the commit of package solfege for openSUSE:Factory checked in at Wed Oct 5 17:48:03 CEST 2011.
-------- --- openSUSE:Factory/solfege/solfege.changes 2011-09-23 12:46:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/solfege/solfege.changes 2011-09-28 19:05:53.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Sep 28 16:12:02 UTC 2011 - [email protected] + +- Changed license field to GPL-3.0+ as solfege upgraded their + license February 5, 2008. bnc#720834 +- Added post script to create /dev/music if it doesn't exist after + reading "README" and moved timidity from "Recommends:" to + "Requires" as solfege needs this for most sound cards to produce + sound. + +------------------------------------------------------------------- +Mon Sep 26 10:20:52 UTC 2011 - [email protected] + +- Update to version 3.20.3, cleaned spec file & refreshed patches. +- Upstream changes and new features : + *Translation updated: French + *Added Spanish translation of the user manual. + *User manual spelling fix + *Added a section in the user manual describing the directory + structure of user lessonfiles. + *Quote all labels in the generated user manual theory images. + This fixes lilypond build problems. + *solfege.desktop: add GenericName + *Help->User Exercises (F9) will now only display lesson files in + USERDATA/.exercises/user/lesson-files since users with lots of + files would have performance problems. + *Add a notice in "User Exercises" that files in ~/lessonfiles + have to be moved into USERDATA/.exercises because future + releases might not list the files. + *See http://www.solfege.org/release-notes/ for other new features + and changes since version 3.18.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- solfege-3.18.7.tar.bz2 New: ---- solfege-3.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solfege.spec ++++++ --- /var/tmp/diff_new_pack.FrtvyV/_old 2011-10-05 17:47:54.000000000 +0200 +++ /var/tmp/diff_new_pack.FrtvyV/_new 2011-10-05 17:47:54.000000000 +0200 @@ -15,27 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define usemyprovides 1 Name: solfege -Summary: Eartraining program -Version: 3.18.7 +Summary: An ear training program +Version: 3.20.3 Release: 2 -License: GPLv2+ +# Solfege has updated it's license. +License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Utilities Url: http://www.solfege.org/ BuildRequires: docbook-xsl-stylesheets fdupes gnome-doc-utils-devel libxslt -BuildRequires: lilypond python-devel swig texinfo update-desktop-files +BuildRequires: python-devel swig texinfo update-desktop-files BuildRequires: python-gtk-devel + +%if 0%{?usemyprovides} == 1 %define _use_internal_dependency_generator 0 %define my_provides /tmp/my-provides -Source: %{name}-%{version}.tar.bz2 +%endif + +Source0: %{name}-%{version}.tar.bz2 Source1: lessonfile_editor.1 Patch0: solfege-configure-fix.dif Patch1: solfege-python-fixcompile.patch -Requires: python-gtk -Recommends: timidity +Requires: python-gtk timidity +Recommends: lilypond BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,10 +51,6 @@ sizes, sing the intervals the computer asks for, identify chords, sing chords, scales, dictation and remember rhythmic patterns. -Authors: --------- - Tom Cato Amundsen <[email protected]> - %prep %setup -q %patch0 @@ -66,40 +67,43 @@ %install %makeinstall + +%if 0%{?usemyprovides} == 1 # exclude plugins from the provide-list cat << EOF > %{my_provides} -grep -v $RPM_BUILD_ROOT%{_libdir}/%{name} | %{__find_provides} +grep -v %{buildroot}%{_libdir}/%{name} | %{__find_provides} EOF chmod 755 %{my_provides} %define __find_provides %{my_provides} +%endif + %suse_update_desktop_file solfege Education X-SuSE-Music -install -m 644 -D graphics/solfege.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/solfege.png + # This line caused bnc#664826 #rm -f %%{buildroot}/%%{_datadir}/%%{name}/%%{name}/_version.* %find_lang %{name} -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} # Fix any .py files with shebangs and wrong permissions. -if test -z `find %{buildroot} -name "*.py" -perm 0644 -print0|xargs -0r grep -l '#!'`; \ -then break; -else chmod -f 0755 `find %{buildroot} -name "*.py" -perm 0644 -print0|xargs -0r grep -l '#!'`; \ +if test -n `find %{buildroot} -name "*.py" -perm 0644 -print0|xargs -0r grep -l '#!'`; \ +then chmod -f 0755 `find %{buildroot} -name "*.py" -perm 0644 -print0|xargs -0r grep -l '#!'`; \ fi -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +if test -a /dev/music; +then break; +else mknod /dev/music u 14 8 > /dev/null; +fi %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT -rm -f %{my_provides} - %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING FAQ README changelog -%doc %{_mandir}/man?/* %{_bindir}/* %{_datadir}/solfege %{_libdir}/solfege +%{_mandir}/man1/*.1.gz %config %{_sysconfdir}/solfege* %{_datadir}/pixmaps/* %{_datadir}/applications/*.desktop ++++++ solfege-3.18.7.tar.bz2 -> solfege-3.20.3.tar.bz2 ++++++ ++++ 120376 lines of diff (skipped) ++++++ solfege-configure-fix.dif ++++++ --- /var/tmp/diff_new_pack.FrtvyV/_old 2011-10-05 17:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FrtvyV/_new 2011-10-05 17:47:56.000000000 +0200 @@ -1,8 +1,8 @@ Index: configure.ac =================================================================== ---- configure.ac.orig 2010-10-29 22:18:36.000000000 +0200 -+++ configure.ac 2010-12-13 00:24:09.000000000 +0200 -@@ -147,9 +147,9 @@ AC_SUBST(ENABLE_TUNER) +--- configure.ac.orig 2011-09-26 10:42:02.188049948 +0200 ++++ configure.ac 2011-09-26 10:42:07.548763835 +0200 +@@ -144,9 +144,9 @@ AC_SUBST(ENABLE_TUNER) dnl Checks for libraries. if test "x$ENABLE_TUNER" = xyes; then ++++++ solfege-python-fixcompile.patch ++++++ --- /var/tmp/diff_new_pack.FrtvyV/_old 2011-10-05 17:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.FrtvyV/_new 2011-10-05 17:47:56.000000000 +0200 @@ -1,8 +1,8 @@ Index: Makefile.in =================================================================== ---- Makefile.in.orig 2010-10-29 22:18:36.000000000 +0200 -+++ Makefile.in 2010-12-13 01:08:51.000000000 +0200 -@@ -143,7 +143,7 @@ install-program-files: +--- Makefile.in.orig 2011-09-26 10:41:59.554190539 +0200 ++++ Makefile.in 2011-09-26 10:42:24.477860639 +0200 +@@ -147,7 +147,7 @@ install-program-files: mkinstalldirs compileall: ifneq "$(nopycompile)" "YES" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
