Hello community, here is the log from the commit of package solfege for openSUSE:Factory checked in at 2019-11-25 00:06:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solfege (Old) and /work/SRC/openSUSE:Factory/.solfege.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solfege" Mon Nov 25 00:06:17 2019 rev:41 rq:750433 version:3.22.2 Changes: -------- --- /work/SRC/openSUSE:Factory/solfege/solfege.changes 2016-09-21 18:49:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.solfege.new.26869/solfege.changes 2019-11-25 00:06:18.727948503 +0100 @@ -1,0 +2,7 @@ +Sat Nov 23 11:23:53 UTC 2019 - Dave Plater <[email protected]> + +- Fix build by removing unnecessary makeinfo rebuild of README, + AUTHORS etc with solfege-nogenreadmeetc.patch. +- Clean up rpm lint errors. + +------------------------------------------------------------------- New: ---- solfege-nogenreadmeetc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solfege.spec ++++++ --- /var/tmp/diff_new_pack.KqGD9R/_old 2019-11-25 00:06:20.415948273 +0100 +++ /var/tmp/diff_new_pack.KqGD9R/_new 2019-11-25 00:06:20.455948268 +0100 @@ -1,7 +1,7 @@ # # spec file for package solfege # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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,7 +25,7 @@ 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 Release: 0 @@ -54,6 +54,7 @@ Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Patch0: solfege-configure-fix.dif Patch1: solfege-python-fixcompile.patch +Patch2: solfege-nogenreadmeetc.patch Requires: python-gtk Requires: timidity Recommends: lilypond @@ -71,15 +72,12 @@ %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 +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python2/' ${i} ;done %build autoreconf -fi + %configure \ --enable-docbook-stylesheet=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/chunker.xsl make %{?jobs:-j%jobs} all @@ -116,7 +114,8 @@ %files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS COPYING FAQ README changelog +%doc AUTHORS FAQ README changelog +%license COPYING %{_bindir}/* %{_datadir}/solfege %{_libdir}/solfege ++++++ solfege-nogenreadmeetc.patch ++++++ From: Dave Plater <[email protected]> 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 \
