From d0f00a22075b1f349425217c1abffd42ba354821c1c5d8c68a0407a4a98e01c5 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 17 Dec 2015 08:22:55 +0000 Subject: [PATCH] Accepting request 349295 from home:plater Remove gstbuzztard from buildrequires, fix minimum required gstreamer. Rename gstreamer pugin package and add provides/obsoletes for existing gst plugins-buzztard OBS-URL: https://build.opensuse.org/request/show/349295 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=10 --- buzztrax.changes | 8 ++++++++ buzztrax.spec | 37 +++++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/buzztrax.changes b/buzztrax.changes index e0e3572..eba5f1c 100644 --- a/buzztrax.changes +++ b/buzztrax.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 17 07:36:32 UTC 2015 - davejplater@gmail.com + +- Renamed gstreamer-1_0-plugins to gstreamer-1_0-plugins-buzztrax +- Created Provides/Obsoletes to handle existing package : + gstreamer-0_10-plugins-buzztard which will be deleted when + buzztrax is in Factory. + ------------------------------------------------------------------- Tue Dec 15 11:10:24 UTC 2015 - davejplater@gmail.com diff --git a/buzztrax.spec b/buzztrax.spec index a6bbf58..082ca24 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -35,14 +35,20 @@ Group: Productivity/Multimedia/Sound/Utilities Url: http://sourceforge.net/projects/buzztard/ Source0: %{name}-%{version}.tar.gz Source1: COPYING-DOCS +# NOTE: The issues fixed by the three patches have been reported upstream +# via email to the developer concerned. version 0.10.1 is already released +# but it doesn't build, I've sent the failed x86_64 build log upstream as well +# so don't expect a fix until after 0.10.1 # The buzztrack songio plugin installs in the unversioned _libexecdir. Patch0: buzztrax-songio-dir.patch +%if 1 == 1 %ifarch i586 # Suppress sse flags for 32 bit build. Patch1: buzztrax-fixx86build.patch # Set calling mode to void for 32 bit build. Patch2: buzztrax-nolibbml_la-bmlw.patch %endif +%endif BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ @@ -62,22 +68,21 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.10.0 BuildRequires: pkgconfig(glib-2.0) >= 2.10.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.10.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.10.0 -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.1.0 -BuildRequires: pkgconfig(gstreamer-audio-1.0) >= 1.1.0 -BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.1.0 -BuildRequires: pkgconfig(gstreamer-controller-1.0) >= 1.1.0 +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.4.3 +BuildRequires: pkgconfig(gstreamer-audio-1.0) >= 1.4.3 +BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.4.3 +BuildRequires: pkgconfig(gstreamer-controller-1.0) >= 1.4.3 BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gtk+-x11-2.0) BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libgnomecanvas-2.0) BuildRequires: pkgconfig(libgsf-1) -BuildRequires: pkgconfig(libgstbuzztard) >= 0.6.0 +#BuildRequires: pkgconfig(libgstbuzztard) >= 0.6.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0 BuildRequires: pkgconfig(pango) -%if %{with bml} -BuildRequires: pkgconfig(libbml) >= 0.6.0 -%endif +Provides: buzztard = %{version} +Obsoletes: buzztard < %{version} %gconf_schemas_requires %description @@ -95,17 +100,18 @@ plugins that are linked together to create different effects. Each of these machines can be controlled realtime or via patterns in the sequencer. -%package -n gstreamer-1_0-plugins +%package -n gstreamer-1_0-plugins-buzztrax Summary: Buzztrax GStreamer plugin Group: Productivity/Multimedia/Other +Provides: gstreamer-0_10-plugins-buzztard = %{version} +Obsoletes: gstreamer-0_10-plugins-buzztard < %{version} -%description -n gstreamer-1_0-plugins +%description -n gstreamer-1_0-plugins-buzztrax Plugin to play Buzztrax songs from any GStreamer compatible app. %package -n libbuzztrax-ic%{ic_soname} Summary: Interaction controller support classes for buzztrax based applications Group: System/Libraries -Recommends: gstreamer-1_0-plugins-buzztrax %description -n libbuzztrax-ic%{ic_soname} This package provides interaction controller support classes for buzztrax based applications. @@ -120,6 +126,8 @@ This package provides core support classes for buzztrax based applications. %package -n libbuzztrax-gst%{gst_soname} Summary: Core support classes for buzztrax based applications Group: System/Libraries +Provides: libgstbuzztard0 = %{version} +Obsoletes: libgstbuzztard0 < %{version} %description -n libbuzztrax-gst%{gst_soname} This package provides gst support classes for buzztrax based applications. @@ -128,6 +136,8 @@ This package provides gst support classes for buzztrax based applications. Summary: Development files for libbuzztrax-gst Group: Development/Libraries/C and C++ Requires: libbuzztrax-gst%{gst_soname} = %{version} +Provides: libgstbuzztard-devel = %{version} +Obsoletes: libgstbuzztard-devel < %{version} %description -n libbuzztrax-gst-devel This package provides the development files for libbuzztrax-gst. @@ -195,7 +205,7 @@ cp -v %{S:1} . #rm -rf src/lib/dllwrapper #rm src/lib/bml/bmlw.c src/lib/bml/BuzzMachineLoader.dll %build - +#export CFLAGS="-Wno-error=implicit-function-declaration %%{optflags}" %configure --disable-static \ --disable-schemas-compile \ --disable-silent-rules \ @@ -209,7 +219,6 @@ make %{?_smp_flags} %install %make_install -# NOTE: There's libraries installed in unversioned libdir must investigate find %{buildroot}%{_libdir} -name '*.la' -delete echo %{buildroot} %find_lang %{name}-%{version} @@ -287,7 +296,7 @@ typelib-1_0-BuzztraxCore-1_1\n %{_datadir}/appdata/buzztrax.appdata.xml %{_datadir}/glib-2.0/schemas/org.buzztrax.gschema.xml -%files -n gstreamer-1_0-plugins +%files -n gstreamer-1_0-plugins-buzztrax %defattr(0644,root,root,0755) %{gstreamer_pluginsdir}/lib*.so