From e3376ae424a5fcb38d534a3ebbc47531a78093d32f2421ca84b9b35b4a9e30f0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 16 Sep 2011 17:26:12 +0000 Subject: [PATCH 1/5] prepare_spec OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=9 From c9d7654329e4948c6dd1c902e81f08542d17fdbff6ffe03cd218f2c1ab4c2d69 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Sep 2011 09:39:26 +0000 Subject: [PATCH 2/5] Accepting request 85401 from home:namtrac:bugfix - Add schismtracker-link.patch to link with new ld OBS-URL: https://build.opensuse.org/request/show/85401 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=10 --- schismtracker-link.patch | 9 +++++++++ schismtracker.changes | 5 +++++ schismtracker.spec | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 schismtracker-link.patch diff --git a/schismtracker-link.patch b/schismtracker-link.patch new file mode 100644 index 0000000..b2203ec --- /dev/null +++ b/schismtracker-link.patch @@ -0,0 +1,9 @@ +--- Makefile.am 2011-04-09 03:19:16.000000000 +0200 ++++ Makefile.am 2011-09-29 11:05:53.551173156 +0200 +@@ -391,5 +391,5 @@ + 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 fa5e654..0065309 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 29 09:06:55 UTC 2011 - idonmez@suse.com + +- Add schismtracker-link.patch to link with new ld + ------------------------------------------------------------------- Sat Apr 9 01:39:48 UTC 2011 - jengelh@medozas.de diff --git a/schismtracker.spec b/schismtracker.spec index 8eeed0e..80ba7e1 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -29,6 +29,7 @@ Source: %name-%version.tar.xz Source1: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff +Patch3: schismtracker-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: xorg-x11-devel @@ -46,7 +47,9 @@ bugfixes and changes to improve IT playback. %prep %setup -q -n %name -%patch -P 1 -P 2 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 %build if [ ! -e configure ]; then From 54556b4d74d7d38d249e5f5c9af1e8d0fcf5aba8b96a0ad69194399eeacf63ed Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Sep 2011 09:43:19 +0000 Subject: [PATCH 3/5] Rediff to use -p1 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=11 --- schismtracker-link.diff | 15 +++++++++++++++ schismtracker-link.patch | 9 --------- schismtracker.spec | 8 +++----- 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 schismtracker-link.diff delete mode 100644 schismtracker-link.patch diff --git a/schismtracker-link.diff b/schismtracker-link.diff new file mode 100644 index 0000000..3656252 --- /dev/null +++ b/schismtracker-link.diff @@ -0,0 +1,15 @@ +--- + 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-link.patch b/schismtracker-link.patch deleted file mode 100644 index b2203ec..0000000 --- a/schismtracker-link.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- Makefile.am 2011-04-09 03:19:16.000000000 +0200 -+++ Makefile.am 2011-09-29 11:05:53.551173156 +0200 -@@ -391,5 +391,5 @@ - 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.spec b/schismtracker.spec index 80ba7e1..fc69583 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -20,7 +20,7 @@ Name: schismtracker Version: 0.20110409 Release: 1 -Url: http://schismtracker.org/ +URL: http://schismtracker.org/ License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors Summary: Music editor that aims to match the look and feel of Impulse Tracker @@ -29,7 +29,7 @@ Source: %name-%version.tar.xz Source1: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff -Patch3: schismtracker-link.patch +Patch3: schismtracker-link.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: xorg-x11-devel @@ -47,9 +47,7 @@ bugfixes and changes to improve IT playback. %prep %setup -q -n %name -%patch1 -p1 -%patch2 -p1 -%patch3 +%patch -P 1 -P 2 -P 3 -p1 %build if [ ! -e configure ]; then From 115e880d4599e7d505711c0c9d4eb2417ff200cd7066b4350e2a18f3826bb648 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Sep 2011 09:58:55 +0000 Subject: [PATCH 4/5] Add upstream URL for patch/report OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=12 --- schismtracker-link.diff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/schismtracker-link.diff b/schismtracker-link.diff index 3656252..d2461ff 100644 --- a/schismtracker-link.diff +++ b/schismtracker-link.diff @@ -1,3 +1,5 @@ +Upstream: http://schismtracker.org/scdev/res/1357.html + --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From 4c7e68ebd26d776976a31b860aad0c4581b4f555241663d63f4e54424259d004 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Sep 2011 10:59:25 +0000 Subject: [PATCH 5/5] Remove trailing space in changelog OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=13 --- schismtracker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schismtracker.changes b/schismtracker.changes index 0065309..d77581c 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Sep 29 09:06:55 UTC 2011 - idonmez@suse.com -- Add schismtracker-link.patch to link with new ld +- Add schismtracker-link.patch to link with new ld ------------------------------------------------------------------- Sat Apr 9 01:39:48 UTC 2011 - jengelh@medozas.de