From 4465925e53e7d06a9c216db0b0a57a7539158ddb Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sep 02 2016 18:33:24 +0000 Subject: Fix build in rawhide. - Add patch to fix rawhide build. - Minor spec cleanup; fix whitespace and rpmlint complaints. - Use %%license. --- diff --git a/bristol-0.60.11-fix-build-with-alsa.patch b/bristol-0.60.11-fix-build-with-alsa.patch new file mode 100644 index 0000000..01e6e16 --- /dev/null +++ b/bristol-0.60.11-fix-build-with-alsa.patch @@ -0,0 +1,10 @@ +--- bristol-0.60.11/libbristolaudio/audioEngineJack.c.FIX_BUILD 2016-09-02 21:07:25.740985012 +0300 ++++ bristol-0.60.11/libbristolaudio/audioEngineJack.c 2016-09-02 21:07:29.714950492 +0300 +@@ -39,7 +39,6 @@ + + #ifdef _BRISTOL_JACK + #if (BRISTOL_HAS_ALSA == 1) +-#include + #endif + + /* diff --git a/bristol-0.60.6-CVE-2010-3351.patch b/bristol-0.60.6-CVE-2010-3351.patch deleted file mode 100644 index 4cf2ae5..0000000 --- a/bristol-0.60.6-CVE-2010-3351.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/startBristol.in~ 2010-07-29 02:42:54.000000000 -0500 -+++ bin/startBristol.in 2010-09-29 09:51:01.529964644 -0500 -@@ -360,7 +360,7 @@ - export SLAB_HOME=$BRISTOL - export BRIGHTON=$BRISTOL - --export LD_LIBRARY_PATH=/usr/local/lib:usr/lib:${LD_LIBRARY_PATH}:${BRISTOL}/lib -+#export LD_LIBRARY_PATH=/usr/local/lib:usr/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}:${BRISTOL}/lib - - export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin - diff --git a/bristol-0.60.8-CVE-2010-3351.patch b/bristol-0.60.8-CVE-2010-3351.patch deleted file mode 100644 index bb1f63e..0000000 --- a/bristol-0.60.8-CVE-2010-3351.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/startBristol.in~ 2010-12-11 04:03:42.000000000 -0600 -+++ bin/startBristol.in 2011-01-26 09:51:23.332041000 -0600 -@@ -424,7 +424,7 @@ - export SLAB_HOME=$BRISTOL - export BRIGHTON=$BRISTOL - --export LD_LIBRARY_PATH=@BRISTOL_DIR@/lib:/usr/local/lib:/usr/lib:/lib -+#export LD_LIBRARY_PATH=@BRISTOL_DIR@/lib:/usr/local/lib:/usr/lib:/lib - - export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin - diff --git a/bristol-0.60.9-CVE-2010-3351.patch b/bristol-0.60.9-CVE-2010-3351.patch index a8bb9d2..cbbb17d 100644 --- a/bristol-0.60.9-CVE-2010-3351.patch +++ b/bristol-0.60.9-CVE-2010-3351.patch @@ -1,5 +1,5 @@ ---- bin/startBristol.in~ 2010-12-27 05:04:26.000000000 -0600 -+++ bin/startBristol.in 2012-01-11 12:23:25.253911768 -0600 +--- a/bin/startBristol.in~ 2010-12-27 05:04:26.000000000 -0600 ++++ b/bin/startBristol.in 2012-01-11 12:23:25.253911768 -0600 @@ -442,7 +442,7 @@ export SLAB_HOME=$BRISTOL export BRIGHTON=$BRISTOL diff --git a/bristol-0.60.9-secondary.patch b/bristol-0.60.9-secondary.patch deleted file mode 100644 index e468716..0000000 --- a/bristol-0.60.9-secondary.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up bristol-0.60.9/libbristol/Makefile.am.secondary bristol-0.60.9/libbristol/Makefile.am ---- bristol-0.60.9/libbristol/Makefile.am.secondary 2010-06-08 10:50:03.000000000 +0200 -+++ bristol-0.60.9/libbristol/Makefile.am 2012-01-20 16:24:59.000000000 +0100 -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS = foreign - - AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@ --libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -+libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ - #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la - - lib_LTLIBRARIES = libbristol.la -diff -up bristol-0.60.9/libbristol/Makefile.in.secondary bristol-0.60.9/libbristol/Makefile.in ---- bristol-0.60.9/libbristol/Makefile.in.secondary 2012-01-20 16:25:57.000000000 +0100 -+++ bristol-0.60.9/libbristol/Makefile.in 2012-01-20 16:26:08.000000000 +0100 -@@ -251,7 +251,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@ --libbristol_la_LDFLAGS = -export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -+libbristol_la_LDFLAGS = -export-dynamic -version-info @BRISTOL_SO_VERSION@ - #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la - lib_LTLIBRARIES = libbristol.la - libbristol_la_SOURCES = audioRoutines.c bristolcdefs.c debugging.c mixroutines.c opmgt.c diff --git a/bristol.spec b/bristol.spec index 9ee0cf1..6a334fe 100644 --- a/bristol.spec +++ b/bristol.spec @@ -1,40 +1,36 @@ -Name: bristol -Version: 0.60.11 -Release: 6%{dist} -Summary: Synthesizer emulator - -Group: Applications/Multimedia -License: GPLv2+ -URL: http://bristol.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.desktop -Patch0: bristol-0.60.9-CVE-2010-3351.patch -# fix build on non-x86 arches (remove compiler options from linker flags) -#Patch1: bristol-0.60.9-secondary.patch - -BuildRequires: libX11-devel alsa-lib-devel jack-audio-connection-kit-devel desktop-file-utils +Name: bristol +Version: 0.60.11 +Release: 7%{dist} +Summary: Synthesizer emulator + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://bristol.sourceforge.net +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source1: %{name}.desktop +Patch0: bristol-0.60.9-CVE-2010-3351.patch +Patch1: bristol-0.60.11-fix-build-with-alsa.patch + +BuildRequires: libX11-devel alsa-lib-devel jack-audio-connection-kit-devel desktop-file-utils %description -Bristol is an emulation package for a number of different 'classic' -synthesizers including additive and subtractive and a few organs. -The application consists of the engine, which is called bristol, +Bristol is an emulation package for a number of different 'classic' +synthesizers including additive and subtractive and a few organs. +The application consists of the engine, which is called bristol, and its own GUI library called brighton that represents all the emulations. %package devel -Summary: %{summary} -Group: Applications/Multimedia -Requires: %{name} = %{version} +Summary: %{summary} +Group: Applications/Multimedia +Requires: %{name} = %{version} %description devel This package contains the development libraries for Bristol. %prep -%setup -q +%autosetup -p1 -%patch0 -p0 -b .libpath -#%patch1 -p1 -b .secondary - -find ./bitmaps/ -name '*.gz' | xargs chmod -x +find ./bitmaps/ -name '*.gz' | xargs chmod -x chmod -x ./memory/profiles/* find . -name '*.c' | xargs chmod -x find . -name '*.h' | xargs chmod -x @@ -45,7 +41,7 @@ chmod -x memory/mixer/default/memory memory/mini/readme.txt # Only x86_64 is optimised for SSE, non x86 platforms don't have SSE %ifnarch x86_64 -sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.am +sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.am sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.in %endif @@ -54,7 +50,7 @@ sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.in sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' @@ -73,8 +69,8 @@ desktop-file-install \ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING* NEWS README +%license COPYING* +%doc AUTHORS ChangeLog NEWS README %{_bindir}/* %{_datadir}/bristol %{_datadir}/pixmaps/* @@ -83,10 +79,14 @@ desktop-file-install \ %{_mandir}/man1/* %files devel -%defattr(-,root,root,-) %{_libdir}/lib*.so %changelog +* Fri Sep 02 2016 Jason L Tibbitts III - 0.60.11-7 +- Add patch to fix rawhide build. +- Minor spec cleanup; fix whitespace and rpmlint complaints. +- Use %%license. + * Wed Feb 03 2016 Fedora Release Engineering - 0.60.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/rpmlint.cf b/rpmlint.cf new file mode 100644 index 0000000..3994e9e --- /dev/null +++ b/rpmlint.cf @@ -0,0 +1 @@ +setOption('NetworkEnabled', False)