From 493ae132f522d3eb8623a85e007aca82f52479c377fd8de203b84884170fc260 Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Tue, 10 Jan 2012 23:47:19 +0000 Subject: [PATCH] - Updated to 1.1.5 + Autotools build resulted in the wrong version number for libfluidsynth.so + One symbol was dropped from libfluidsynth.so - this symbol was not part of the public API though + JACK: Using jack_free instead of free when needed + Update Free Software Foundation address - Run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fluidsynth?expand=0&rev=22 --- fluidsynth-1.1.4.tar.bz2 | 3 -- fluidsynth-1.1.5.tar.bz2 | 3 ++ fluidsynth-add-missing-export-for-1.1.4.diff | 19 ----------- fluidsynth.changes | 12 +++++++ fluidsynth.spec | 36 ++++++++++++-------- 5 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 fluidsynth-1.1.4.tar.bz2 create mode 100644 fluidsynth-1.1.5.tar.bz2 delete mode 100644 fluidsynth-add-missing-export-for-1.1.4.diff diff --git a/fluidsynth-1.1.4.tar.bz2 b/fluidsynth-1.1.4.tar.bz2 deleted file mode 100644 index e7972e3..0000000 --- a/fluidsynth-1.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56108f946f102fa08427c6ee416c842fb923576d78b4dd96abc457dffa8ec10f -size 799903 diff --git a/fluidsynth-1.1.5.tar.bz2 b/fluidsynth-1.1.5.tar.bz2 new file mode 100644 index 0000000..655ecd6 --- /dev/null +++ b/fluidsynth-1.1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4 +size 800195 diff --git a/fluidsynth-add-missing-export-for-1.1.4.diff b/fluidsynth-add-missing-export-for-1.1.4.diff deleted file mode 100644 index e8a3f6c..0000000 --- a/fluidsynth-add-missing-export-for-1.1.4.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- - src/sfloader/fluid_defsfont.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/src/sfloader/fluid_defsfont.c -+++ b/src/sfloader/fluid_defsfont.c -@@ -109,6 +109,12 @@ - return fluid_defsfont_get_name((fluid_defsfont_t*) sfont->data); - } - -+fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s) -+{ -+ /* This function is here just to avoid an ABI/SONAME bump, see ticket #98. Should never be used. */ -+ return NULL; -+} -+ - fluid_preset_t* - fluid_defsfont_sfont_get_preset(fluid_sfont_t* sfont, unsigned int bank, unsigned int prenum) - { diff --git a/fluidsynth.changes b/fluidsynth.changes index 211da82..e799764 100644 --- a/fluidsynth.changes +++ b/fluidsynth.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 10 23:45:05 UTC 2012 - reddwarf@opensuse.org + +- Updated to 1.1.5 + + Autotools build resulted in the wrong version number for + libfluidsynth.so + + One symbol was dropped from libfluidsynth.so - this symbol was + not part of the public API though + + JACK: Using jack_free instead of free when needed + + Update Free Software Foundation address +- Run spec-cleaner + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/fluidsynth.spec b/fluidsynth.spec index 6a8d83e..9973cef 100644 --- a/fluidsynth.spec +++ b/fluidsynth.spec @@ -1,7 +1,7 @@ # # spec file for package fluidsynth # -# 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 @@ -18,20 +18,26 @@ Name: fluidsynth -BuildRequires: alsa-devel ladspa-devel libjack-devel readline-devel -BuildRequires: dbus-1-devel lash-devel libsndfile-devel pulseaudio-devel -BuildRequires: cmake -Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm) -Version: 1.1.4 +Version: 1.1.5 Release: 1 -Group: Productivity/Multimedia/Sound/Midi # Obsoletes: iiwusynth # Provides: iiwusynth -License: LGPLv2.1+ +License: LGPL-2.1+ +Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm) Url: http://www.fluidsynth.org/ -Source: %{name}-%{version}.tar.bz2 +Group: Productivity/Multimedia/Sound/Midi +Source: http://downloads.sourceforge.net/project/fluidsynth/fluidsynth-%{version}/%{name}-%{version}.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: fluidsynth-fix-build-lash.diff -Patch2: fluidsynth-add-missing-export-for-1.1.4.diff +BuildRequires: alsa-devel +BuildRequires: cmake +BuildRequires: ladspa-devel +BuildRequires: lash-devel +BuildRequires: libjack-devel +BuildRequires: libsndfile-devel +BuildRequires: pulseaudio-devel +BuildRequires: readline-devel +BuildRequires: pkgconfig(dbus-1) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,10 +47,11 @@ can read MIDI events from the MIDI input device and render them to the audio device. It can also play MIDI files. %package devel -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Development package for the fluidsynth library Group: Development/Libraries/C and C++ -Requires: libfluidsynth1 = %{version} glibc-devel +Requires: glibc-devel +Requires: libfluidsynth1 = %{version} Provides: libfluidsynth-devel = %{version} %description devel @@ -52,7 +59,7 @@ This package contains the files needed to compile programs that use the fluidsynth library. %package -n libfluidsynth1 -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Library for Fluidsynth Group: System/Libraries @@ -62,7 +69,6 @@ This package contains the shared library for Fluidsynth. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build mkdir build @@ -72,7 +78,7 @@ make %{?_smp_mflags} VERBOSE=1 %install cd build -make install DESTDIR=$RPM_BUILD_ROOT +%make_install %post -n libfluidsynth1 -p /sbin/ldconfig