Hello community, here is the log from the commit of package solfege for openSUSE:Leap:15.2 checked in at 2020-05-13 03:53:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/solfege (Old) and /work/SRC/openSUSE:Leap:15.2/.solfege.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solfege" Wed May 13 03:53:56 2020 rev:11 rq:802402 version:3.23.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/solfege/solfege.changes 2020-01-15 16:03:29.187927561 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.solfege.new.2738/solfege.changes 2020-05-13 03:53:56.904465598 +0200 @@ -1,0 +2,41 @@ +Thu May 7 13:07:30 UTC 2020 - Dave Plater <davejpla...@gmail.com> + +- Fix lilypond font requirement for lilypond-2.20.0 + +------------------------------------------------------------------- +Mon Feb 24 04:23:56 UTC 2020 - Bernhard Wiedemann <bwiedem...@suse.com> + +- Add reproducible.patch to sort python glob to make + package build reproducible + +------------------------------------------------------------------- +Wed Feb 19 08:25:11 UTC 2020 - Dave Plater <davejpla...@gmail.com> + +- Update to version 3.23.4 and remove all traces of python2 +- Upstream changes: + *fix F9 listing user lesson files + *toneincontext: let the user compare and practise when answering + wrong + *toneincontext: remove Give up button + *port exporting exercises to audio files and creating ear training + test + *printouts to python3/gtk3 + *download ALSA: reload moved to importlib + *Ported winmidi.c to Python 3!! + *winreg, osutils, filesystem win32 fixes + *toneincontext: select between number and solfa buttons + *toneincontext in minor: ask for correct tones + *toneincontext: clear flashbar after we give up + *toneincontext: statistics for x last question + *.solfegerc: sort sections and variable on save + *toneincontext: let the user set the tempo + *Fix bug #48079: label for interval accels + +------------------------------------------------------------------- +Sat Nov 23 11:23:53 UTC 2019 - Dave Plater <davejpla...@gmail.com> + +- Fix build by removing unnecessary makeinfo rebuild of README, + AUTHORS etc with solfege-nogenreadmeetc.patch. +- Clean up rpm lint errors. + +------------------------------------------------------------------- Old: ---- solfege-3.22.2.tar.xz solfege-3.22.2.tar.xz.sig New: ---- reproducible.patch solfege-3.23.4.tar.gz solfege-3.23.4.tar.gz.sig solfege-nogenreadmeetc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solfege.spec ++++++ --- /var/tmp/diff_new_pack.cbYaiz/_old 2020-05-13 03:53:57.392466622 +0200 +++ /var/tmp/diff_new_pack.cbYaiz/_new 2020-05-13 03:53:57.396466630 +0200 @@ -1,7 +1,7 @@ # # spec file for package solfege # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,21 +25,21 @@ Name: solfege Summary: An ear training program -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Utilities -Version: 3.22.2 +Version: 3.23.4 Release: 0 -Url: https://www.gnu.org/software/solfege/ +URL: https://www.gnu.org/software/solfege/ BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: libxslt -BuildRequires: python-devel -BuildRequires: python-gtk-devel +BuildRequires: python3-gobject-devel BuildRequires: swig BuildRequires: texinfo BuildRequires: update-desktop-files +BuildRequires: pkgconfig(python3) %if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 BuildRequires: txt2man %endif @@ -49,15 +49,17 @@ %define my_provides /tmp/my-provides %endif -Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source1: lessonfile_editor.1 -Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig +Source2: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig Patch0: solfege-configure-fix.dif Patch1: solfege-python-fixcompile.patch -Requires: python-gtk +Patch2: solfege-nogenreadmeetc.patch +# PATCH-FIX-UPSTREAM - sent by mail to tca@gnu - is upstream orphaned? +Patch3: reproducible.patch +Requires: lilypond-fonts-common >= 2.20 +Requires: python3-gobject-Gdk Requires: timidity -Recommends: lilypond -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Solfege is an eartraining program for X written in python, using @@ -71,17 +73,18 @@ %setup -q %patch0 %patch1 -# hack to avoid txt2man (which is missing in prior SUSE distro) -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 -%else -touch *.1 -cp %{SOURCE1} . -%endif +%patch2 +%patch3 -p1 + +for i in `grep -rl "/usr/bin/env python "`;do $(chmod 0755 ${i} ; sed -i '1s/^#!.*/#!\/usr\/bin\/python3 /' ${i}) ;done +#for i in `grep -rl "!/usr/bin/python "`;do $(chmod 0755 ${i} ; sed -i '1s/^#!.*/#!\/usr\/bin\/python3 /' ${i}) ;done %build autoreconf -fi + %configure \ - --enable-docbook-stylesheet=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/chunker.xsl + --enable-docbook-stylesheet=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/chunker.xsl \ + --disable-oss-sound make %{?jobs:-j%jobs} all %install @@ -104,22 +107,27 @@ %fdupes -s %{buildroot} # Fix any .py files with shebangs and wrong permissions. chmod 0755 %{buildroot}/usr/share/solfege/solfege/_version.py +chmod 0755 %{buildroot}/usr/share/solfege/solfege/parsetree.py +chmod 0755 %{buildroot}/usr/share/solfege/solfege/presetup.py +chmod 0644 %{buildroot}/usr/share/solfege/solfege/_version.py +find %{buildroot}/usr/share/solfege/ -name "*~" -print -delete %post -/sbin/ldconfig +#/sbin/ldconfig if test -e /dev/music; then break; else mknod /dev/music u 14 8 > /dev/null; fi -%postun -p /sbin/ldconfig +#%%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS COPYING FAQ README changelog +%doc changelog +%license COPYING %{_bindir}/* %{_datadir}/solfege -%{_libdir}/solfege +#%%{_libdir}/solfege %{_mandir}/man1/*.1.gz %config %{_sysconfdir}/solfege* %{_datadir}/pixmaps/* ++++++ reproducible.patch ++++++ commit 29fbd6ac51c1983dd8cb29a02e7a3554d2243a08 Author: Bernhard M. Wiedemann <bwiedem...@suse.de> Date: Sun Feb 23 21:12:35 2020 +0100 Sort input file list so that solfege-3.23.4/solfege/languages.py in openSUSE's solfege package builds in a reproducible way in spite of indeterministic filesystem readdir order and http://bugs.python.org/issue30461 See https://reproducible-builds.org/ for why this is good. diff --git a/tools/buildutil.py b/tools/buildutil.py index fce99b9..c908f99 100644 --- a/tools/buildutil.py +++ b/tools/buildutil.py @@ -35,7 +35,7 @@ C_locale_idx = 1 languages = [ 'system default', 'English/United States [en-us]',""", file=f) - for fn in glob.glob("po/*.po"): + for fn in sorted(glob.glob("po/*.po")): print(" '%s'," % os.path.splitext(os.path.basename(fn))[0], file=f) print("]", file=f) f.close() ++++++ solfege-nogenreadmeetc.patch ++++++ From: Dave Plater <davejpla...@gmail.com> Date: 2019-11-23 13:13:22 +0200 Subject: Don't rebuild AUTHORS INSTALL README FAQ, they exist. Index: Makefile.in =================================================================== --- Makefile.in.orig 2019-11-23 12:59:02.395971346 +0200 +++ Makefile.in 2019-11-23 13:01:30.897831528 +0200 @@ -62,7 +62,7 @@ export LIBS:=@LIBS@ export DISTNAME:=$(PACKAGE)-$(VERSION) export DISTDIR:=$(PWD)/$(PACKAGE)-$(VERSION) -TARGETS += AUTHORS INSTALL README FAQ INSTALL.win32 +#TARGETS += AUTHORS INSTALL README FAQ INSTALL.win32 installfiles += ui.xml help-menu.xml .PHONY: all genfiles genlyfiles @@ -79,8 +79,8 @@ SUBDIRS := po feta solfege test tools to FAQ INSTALL.win32 README INSTALL : topdocs/defs.texi -%: topdocs/%.texi - LC_ALL=C makeinfo -I topdocs --no-split --no-headers --output $(notdir $(basename $<)) $< +#%: topdocs/%.texi +# LC_ALL=C makeinfo -I topdocs --no-split --no-headers --output $(notdir $(basename $<)) $< dist_files = AUTHORS COPYING INSTALL FAQ INSTALL.win32 \ Makefile.in config.h.in \
