Accepting request 636357 from home:derselbst:branches:multimedia:libs

- Update to 2.0.0
- bump soversion to 2
- require cmake >= 3.1.0
- execute unit tests (make check)
- remove cmake option 'enable-ladspa' as it's now enabled by default
- add conditionals to spec file to allow builds for other RPM-based distributions

OBS-URL: https://build.opensuse.org/request/show/636357
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fluidsynth?expand=0&rev=49

baselibs.conf

@@ -1 +1 @@
-libfluidsynth1
+libfluidsynth2

fluidsynth-1.1.11.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
-size 634566

fluidsynth-2.0.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ca094efbe13fdb880cfd0431354a7b85daf7239c344939493a2aaeca4e59ed5
+size 1369331

fluidsynth.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 14 15:24:14 UTC 2018 - tom.mbrt@googlemail.com
+
+- Update to 2.0.0:
+   * for a full changelog, see https://github.com/FluidSynth/fluidsynth/wiki/ChangeLog#fluidsynth-200
+   * for API/ABI breaking changes, see http://www.fluidsynth.org/api/index.html#NewIn2_0_0
+- bump soversion to 2
+- require cmake >= 3.1.0
+- execute unit tests (make check)
+- remove cmake option 'enable-ladspa' as it's now enabled by default
+- add conditionals to spec file to allow builds for other RPM-based distributions
+
 -------------------------------------------------------------------
 Sun May  6 06:55:29 UTC 2018 - tom.mbrt@googlemail.com
 

fluidsynth.spec

@@ -24,7 +24,7 @@
 %endif
 
 Name:           fluidsynth
-Version:        1.1.11
+Version:        2.0.0
 Release:        0
 Summary:        A Real-Time Software Synthesizer That Uses Soundfont(tm)
 License:        LGPL-2.1+
@@ -32,7 +32,7 @@ Group:          Productivity/Multimedia/Sound/Midi
 Url:            http://www.fluidsynth.org/
 Source:         https://github.com/FluidSynth/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1000:     baselibs.conf
-BuildRequires:  cmake >= 3.0.2
+BuildRequires:  cmake >= 3.1.0
 BuildRequires:  ladspa-devel
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
@@ -41,8 +41,10 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(sndfile)
+%if 0%{?suse_version}
 %{?systemd_requires}
 PreReq:         %fillup_prereq
+%endif
 
 %description
 FluidSynth (formerly IIWU Synth) is a real-time software synthesizer
@@ -54,18 +56,18 @@ can also play MIDI files.
 Summary:        Development package for the fluidsynth library
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
-Requires:       libfluidsynth1 = %{version}
+Requires:       libfluidsynth2 = %{version}
 Provides:       libfluidsynth-devel = %{version}
 
 %description devel
 This package contains the files needed to compile programs that use the
 fluidsynth library.
 
-%package -n libfluidsynth1
+%package -n libfluidsynth2
 Summary:        Library for Fluidsynth
 Group:          System/Libraries
 
-%description -n libfluidsynth1
+%description -n libfluidsynth2
 This package contains the shared library for Fluidsynth.
 
 %prep
@@ -74,12 +76,25 @@ This package contains the shared library for Fluidsynth.
 %build
 %cmake \
     -DFLUID_DAEMON_ENV_FILE=%{_fillupdir}/sysconfig.%{name} \
-    -Denable-ladspa=1 \
     -Denable-lash=0
 make %{?_smp_mflags}
 
+%check
+# depending on the distribution being built for, cmake
+# may or may not create a 'build' subdirectory
+%cmake
+# cannot call ctest as the unit tests need to be compiled yet
+make check
+
 %install
+%if 0%{?suse_version}
 %cmake_install
+%else
+%cmake
+DESTDIR=$RPM_BUILD_ROOT make install
+%endif
+
+%if 0%{?suse_version}
 
 # manually install systemd service files
 install -Dm 644 build/fluidsynth.conf %{buildroot}%{_fillupdir}/sysconfig.%{name}
@@ -87,9 +102,6 @@ install -Dm 644 build/fluidsynth.service %{buildroot}%{_unitdir}/%{name}.service
 install -d %{buildroot}%{_sbindir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
-%post -n libfluidsynth1 -p /sbin/ldconfig
-%postun -n libfluidsynth1 -p /sbin/ldconfig
-
 %pre
 %service_add_pre %{name}.service
 
@@ -103,21 +115,28 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %postun
 %service_del_postun %{name}.service
 
+%endif
+
+%post -n libfluidsynth2 -p /sbin/ldconfig
+%postun -n libfluidsynth2 -p /sbin/ldconfig
+
 %files
 %license LICENSE
 %doc AUTHORS ChangeLog NEWS README.md THANKS TODO
 %{_mandir}/man?/*
 %{_bindir}/*
+%if 0%{?suse_version}
 %{_unitdir}/%{name}.service
 %{_sbindir}/rc%{name}
 %{_fillupdir}/sysconfig.%{name}
+%endif
 
 %files devel
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc
 
-%files -n libfluidsynth1
+%files -n libfluidsynth2
 %{_libdir}/lib*.so.*
 
 %changelog