From 1a76dcbc8afcaa87220b56df19db073483730ea20d413c58ff268a07fb8718f6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 2 Dec 2011 15:12:45 +0000 Subject: [PATCH 1/4] Accepting request 94932 from home:coolo:removeautomake add automake to buildrequires OBS-URL: https://build.opensuse.org/request/show/94932 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=16 --- schismtracker.changes | 5 +++++ schismtracker.spec | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/schismtracker.changes b/schismtracker.changes index d77581c..1b0f8cf 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 2 07:22:57 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Thu Sep 29 09:06:55 UTC 2011 - idonmez@suse.com diff --git a/schismtracker.spec b/schismtracker.spec index fc69583..560a4a7 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: schismtracker Version: 0.20110409 -Release: 1 -URL: http://schismtracker.org/ -License: GPL v2 or later +Release: 0 +Url: http://schismtracker.org/ +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors Summary: Music editor that aims to match the look and feel of Impulse Tracker #Hg-Clone: http://schismtracker.org/hg/ @@ -32,10 +30,14 @@ Patch2: schism-nodate.diff Patch3: schismtracker-link.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 -BuildRequires: xorg-x11-devel -BuildRequires: alsa-devel freeglut-devel gcc-c++ -BuildRequires: python >= 2.4 xz +BuildRequires: alsa-devel +BuildRequires: automake +BuildRequires: freeglut-devel +BuildRequires: gcc-c++ +BuildRequires: python >= 2.4 BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +BuildRequires: xz %description Schism Tracker is a free reimplementation of Impulse Tracker, a From 5143ac1d3777e8910a62d814fd7853d4cf39b1e5caa30fdb708b585b55c49f24 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 15:55:55 +0000 Subject: [PATCH 2/4] Update to 20120105 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=17 --- schismtracker-0.20110409.tar.xz | 3 --- schismtracker-20120105.tar.xz | 3 +++ schismtracker-link.diff | 17 ----------------- schismtracker.changes | 16 ++++++++++++++++ schismtracker.spec | 17 +++++++---------- 5 files changed, 26 insertions(+), 30 deletions(-) delete mode 100644 schismtracker-0.20110409.tar.xz create mode 100644 schismtracker-20120105.tar.xz delete mode 100644 schismtracker-link.diff diff --git a/schismtracker-0.20110409.tar.xz b/schismtracker-0.20110409.tar.xz deleted file mode 100644 index 031d8e3..0000000 --- a/schismtracker-0.20110409.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31d6c04a3eb95b5acd414bb6860ecbed6a341ed50c818bbbd416b2b944484abc -size 786356 diff --git a/schismtracker-20120105.tar.xz b/schismtracker-20120105.tar.xz new file mode 100644 index 0000000..1fb7729 --- /dev/null +++ b/schismtracker-20120105.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ef4a6523bcb05b59aab9799c3aac79a3b7dc74c1c08748c983273c44274061c +size 915696 diff --git a/schismtracker-link.diff b/schismtracker-link.diff deleted file mode 100644 index d2461ff..0000000 --- a/schismtracker-link.diff +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: http://schismtracker.org/scdev/res/1357.html - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: schismtracker/Makefile.am -=================================================================== ---- schismtracker.orig/Makefile.am -+++ schismtracker/Makefile.am -@@ -391,5 +391,5 @@ AM_CFLAGS = $(SDL_CFLAGS) $(cflags_alsa) - AM_OBJCFLAGS = $(AM_CFLAGS) - - schismtracker_DEPENDENCIES = $(files_windres) --schismtracker_LDADD = $(lib_asound) $(lib_win32) $(SDL_LIBS) $(LIBM) -+schismtracker_LDADD = $(lib_asound) $(lib_win32) $(SDL_LIBS) $(LIBM) -ldl - diff --git a/schismtracker.changes b/schismtracker.changes index 1b0f8cf..8c85a8d 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Feb 8 14:40:22 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 20120105 +* Shift-F10 now provides a dialog if the orderlist is empty +* Fix loop points when deleting last point in envelope +* Instrument list: Alt-Shift-A on trans table now copies sample + name as well as assigning sample numbers +* Less picky sample-replacement checking for pattern-to-sample + rendering +* Pattern editor: enter key now does channel search for instrument + number if none is under the cursor +* Add hidden option for inverted (more FT2-like) home/end key + behavior in the pattern editor +* Fix garbage writing when swapping portamento to the volume column + ------------------------------------------------------------------- Fri Dec 2 07:22:57 UTC 2011 - coolo@suse.com diff --git a/schismtracker.spec b/schismtracker.spec index 560a4a7..d6c447a 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -1,7 +1,7 @@ # # spec file for package schismtracker # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,18 @@ # Name: schismtracker -Version: 0.20110409 +%define rversion 20120105 +Version: 0.%rversion Release: 0 Url: http://schismtracker.org/ +Summary: Music editor that aims to match the look and feel of Impulse Tracker License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Editors and Convertors -Summary: Music editor that aims to match the look and feel of Impulse Tracker #Hg-Clone: http://schismtracker.org/hg/ -Source: %name-%version.tar.xz +Source: %name-%rversion.tar.xz Source1: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff -Patch3: schismtracker-link.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: alsa-devel @@ -48,8 +48,8 @@ highly modified version of the Modplug engine, with a number of bugfixes and changes to improve IT playback. %prep -%setup -q -n %name -%patch -P 1 -P 2 -P 3 -p1 +%setup -qn %name-%rversion +%patch -P 1 -P 2 -p1 %build if [ ! -e configure ]; then @@ -68,9 +68,6 @@ install -D -m 0644 icons/schism-icon.svg %buildroot%_datadir/icons/hicolor/scala # install desktop file %suse_update_desktop_file -i %name -%clean -rm -rf %buildroot - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README From 3730c205836d3fd55b2c7103bab2f5f60288012e83613495e540bff93c68f686 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 17:57:05 +0000 Subject: [PATCH 3/4] Try with -j1 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=18 --- schismtracker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schismtracker.spec b/schismtracker.spec index d6c447a..a2a8e7b 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -56,7 +56,7 @@ if [ ! -e configure ]; then autoreconf -fi fi %configure -make %{?_smp_mflags} +make %install make DESTDIR=%buildroot install From 417fce55166bee4fb837597b83fda5459c05deb7d46c8865a2c8dd688014296d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 21:09:50 +0000 Subject: [PATCH 4/4] Add patch to workaround flakey "auto" dir creation OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=19 --- schism-deptrack.diff | 29 +++++++++++++++++++++++++++++ schismtracker.spec | 12 +++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 schism-deptrack.diff diff --git a/schism-deptrack.diff b/schism-deptrack.diff new file mode 100644 index 0000000..b324c31 --- /dev/null +++ b/schism-deptrack.diff @@ -0,0 +1,29 @@ +--- + Makefile.am | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +Index: schismtracker-20120105/Makefile.am +=================================================================== +--- schismtracker-20120105.orig/Makefile.am ++++ schismtracker-20120105/Makefile.am +@@ -158,6 +158,7 @@ CLEANFILES = \ + auto/helptext.c + + auto/default-font.c: Makefile.am scripts/bin2h.sh scripts/build-font.sh $(fonts) ++ ${MKDIR_P} auto + sh $(srcdir)/scripts/build-font.sh $(srcdir) $(fonts) >$@ + auto/helptext.c: Makefile.am scripts/genhelp.py $(helptexts) + $(PYTHON) $(srcdir)/scripts/genhelp.py $(srcdir) $(helptexts) >$@ +Index: schismtracker-20120105/configure.ac +=================================================================== +--- schismtracker-20120105.orig/configure.ac ++++ schismtracker-20120105/configure.ac +@@ -42,6 +42,7 @@ AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_CC_C99 ++AC_PROG_MKDIR_P + + dnl Windows poop + AC_CHECK_TOOL([WINDRES], [windres]) diff --git a/schismtracker.spec b/schismtracker.spec index a2a8e7b..64cc6b5 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: schismtracker %define rversion 20120105 Version: 0.%rversion @@ -28,12 +29,15 @@ Source: %name-%rversion.tar.xz Source1: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff +Patch3: schism-deptrack.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: alsa-devel +BuildRequires: autoconf BuildRequires: automake BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: python >= 2.4 BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel @@ -49,14 +53,12 @@ bugfixes and changes to improve IT playback. %prep %setup -qn %name-%rversion -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -if [ ! -e configure ]; then - autoreconf -fi -fi +autoreconf -fi %configure -make +make %{?_smp_mflags} %install make DESTDIR=%buildroot install