From 0d72931c6457d7971cea420ea136ad2c2c8ff38f8882f60fde1442b501e245f7 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 14 Dec 2015 12:43:52 +0000 Subject: [PATCH] Accepting request 348826 from home:plater Basis of a working package OBS-URL: https://build.opensuse.org/request/show/348826 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/buzztrax?expand=0&rev=4 --- buzztard-0.6.0-core_gir.patch | 40 -------- buzztard-0.6.0-desktop_file.patch | 10 -- buzztard-0.6.0-gir.patch | 66 ------------- buzztard-0.6.0-mime.patch | 69 -------------- buzztard-0.6.0-no_check.patch | 15 --- buzztrax.spec | 152 ++++++++++++++++++++++-------- 6 files changed, 115 insertions(+), 237 deletions(-) delete mode 100644 buzztard-0.6.0-core_gir.patch delete mode 100644 buzztard-0.6.0-desktop_file.patch delete mode 100644 buzztard-0.6.0-gir.patch delete mode 100644 buzztard-0.6.0-mime.patch delete mode 100644 buzztard-0.6.0-no_check.patch diff --git a/buzztard-0.6.0-core_gir.patch b/buzztard-0.6.0-core_gir.patch deleted file mode 100644 index 865d6b0..0000000 --- a/buzztard-0.6.0-core_gir.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: src/lib/core/Makefile.am -=================================================================== ---- src/lib/core/Makefile.am.orig -+++ src/lib/core/Makefile.am -@@ -83,13 +83,14 @@ if USE_GIR - gir_sources=$(patsubst %,$(srcdir)/%, $(libbuzztard_core_la_SOURCES)) - - BuzztardCore-0.0.gir: $(G_IR_SCANNER) libbuzztard-core.la -- -$(AM_V_GEN)$(G_IR_SCANNER) -v \ -+ -PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_srcdir)/src/lib/ic/" $(AM_V_GEN)$(G_IR_SCANNER) -v \ - --namespace=BuzztardCore \ - --nsversion 0.0 \ - -I$(builddir)/libbuzztard-core \ - -I$(srcdir) \ - -I$(srcdir)/libbuzztard_core/ \ - -I$(top_srcdir)/src/lib/ic/libbuzztard-ic/ \ -+ -I$(top_srcdir)/src/lib/ic/ \ - --add-include-path=$(top_srcdir)/src/lib/ic/ \ - --identifier-prefix=Bt \ - --symbol-prefix=bt \ -Index: src/lib/core/Makefile.in -=================================================================== ---- src/lib/core/Makefile.in.orig -+++ src/lib/core/Makefile.in -@@ -1278,13 +1278,14 @@ marshal.c: marshal.list - glib-genmarshal --body --prefix=bt_marshal $(srcdir)/marshal.list > marshal.c - - @USE_GIR_TRUE@BuzztardCore-0.0.gir: $(G_IR_SCANNER) libbuzztard-core.la --@USE_GIR_TRUE@ -$(AM_V_GEN)$(G_IR_SCANNER) -v \ -+@USE_GIR_TRUE@ -PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_srcdir)/src/lib/ic/" $(AM_V_GEN)$(G_IR_SCANNER) -v \ - @USE_GIR_TRUE@ --namespace=BuzztardCore \ - @USE_GIR_TRUE@ --nsversion 0.0 \ - @USE_GIR_TRUE@ -I$(builddir)/libbuzztard-core \ - @USE_GIR_TRUE@ -I$(srcdir) \ - @USE_GIR_TRUE@ -I$(srcdir)/libbuzztard_core/ \ - @USE_GIR_TRUE@ -I$(top_srcdir)/src/lib/ic/libbuzztard-ic/ \ -+@USE_GIR_TRUE@ -I$(top_srcdir)/src/lib/ic/ \ - @USE_GIR_TRUE@ --add-include-path=$(top_srcdir)/src/lib/ic/ \ - @USE_GIR_TRUE@ --identifier-prefix=Bt \ - @USE_GIR_TRUE@ --symbol-prefix=bt \ diff --git a/buzztard-0.6.0-desktop_file.patch b/buzztard-0.6.0-desktop_file.patch deleted file mode 100644 index 380616f..0000000 --- a/buzztard-0.6.0-desktop_file.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: src/ui/edit/buzztard-edit.desktop.in -=================================================================== ---- src/ui/edit/buzztard-edit.desktop.in.orig -+++ src/ui/edit/buzztard-edit.desktop.in -@@ -1,5 +1,4 @@ - [Desktop Entry] --Version=0.6.0 - Type=Application - _Name=Buzztard Music Editor - _Comment=Edit buzztard song files diff --git a/buzztard-0.6.0-gir.patch b/buzztard-0.6.0-gir.patch deleted file mode 100644 index 0a70527..0000000 --- a/buzztard-0.6.0-gir.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: src/lib/core/Makefile.am -=================================================================== ---- src/lib/core/Makefile.am.orig -+++ src/lib/core/Makefile.am -@@ -112,10 +112,10 @@ BuzztardCore-0.0.gir: $(G_IR_SCANNER) li - $(gir_sources) || touch $@ - BUILT_GIRSOURCES = BuzztardCore-0.0.gir - --girdir = $(datadir)/gir -+girdir = $(GIRDIR) - dist_gir_DATA = $(BUILT_GIRSOURCES) - --typelibsdir = $(libdir)/girepository -+typelibsdir = $(TYPELIBDIR) - typelibs_DATA = $(dist_gir_DATA:.gir=.typelib) - - TXML = $(dist_gir_DATA:.gir=.gir.txml) -Index: src/lib/ic/Makefile.am -=================================================================== ---- src/lib/ic/Makefile.am.orig -+++ src/lib/ic/Makefile.am -@@ -83,10 +83,10 @@ BuzztardIc-0.0.gir: $(G_IR_SCANNER) libb - $(gir_sources) || touch $@ - BUILT_GIRSOURCES = BuzztardIc-0.0.gir - --girdir = $(datadir)/gir -+girdir = $(GIRDIR) - dist_gir_DATA = $(BUILT_GIRSOURCES) - --typelibsdir = $(libdir)/girepository -+typelibsdir = $(TYPELIBDIR) - typelibs_DATA = $(dist_gir_DATA:.gir=.typelib) - - TXML = $(dist_gir_DATA:.gir=.gir.txml) -Index: src/lib/core/Makefile.in -=================================================================== ---- src/lib/core/Makefile.in.orig -+++ src/lib/core/Makefile.in -@@ -508,9 +508,9 @@ pkgconfig_DATA = libbuzztard-core.pc - @USE_GIR_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libbuzztard_core_la_SOURCES)) - @USE_GIR_FALSE@BUILT_GIRSOURCES = - @USE_GIR_TRUE@BUILT_GIRSOURCES = BuzztardCore-0.0.gir --@USE_GIR_TRUE@girdir = $(datadir)/gir -+@USE_GIR_TRUE@girdir = $(GIRDIR) - @USE_GIR_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES) --@USE_GIR_TRUE@typelibsdir = $(libdir)/girepository -+@USE_GIR_TRUE@typelibsdir = $(TYPELIBDIR) - @USE_GIR_TRUE@typelibs_DATA = $(dist_gir_DATA:.gir=.typelib) - @USE_GIR_TRUE@TXML = $(dist_gir_DATA:.gir=.gir.txml) - EXTRA_DIST = \ -Index: src/lib/ic/Makefile.in -=================================================================== ---- src/lib/ic/Makefile.in.orig -+++ src/lib/ic/Makefile.in -@@ -455,9 +455,9 @@ pkgconfig_DATA = libbuzztard-ic.pc - @USE_GIR_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libbuzztard_ic_la_SOURCES)) - @USE_GIR_FALSE@BUILT_GIRSOURCES = - @USE_GIR_TRUE@BUILT_GIRSOURCES = BuzztardIc-0.0.gir --@USE_GIR_TRUE@girdir = $(datadir)/gir -+@USE_GIR_TRUE@girdir = $(GIRDIR) - @USE_GIR_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES) --@USE_GIR_TRUE@typelibsdir = $(libdir)/girepository -+@USE_GIR_TRUE@typelibsdir = $(TYPELIBDIR) - @USE_GIR_TRUE@typelibs_DATA = $(dist_gir_DATA:.gir=.typelib) - @USE_GIR_TRUE@TXML = $(dist_gir_DATA:.gir=.gir.txml) - EXTRA_DIST = \ diff --git a/buzztard-0.6.0-mime.patch b/buzztard-0.6.0-mime.patch deleted file mode 100644 index 40c6074..0000000 --- a/buzztard-0.6.0-mime.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: src/lib/Makefile.am -=================================================================== ---- src/lib/Makefile.am.orig -+++ src/lib/Makefile.am -@@ -12,13 +12,6 @@ CLEANFILES = $(sharedmimepackage_DATA) - EXTRA_DIST = $(sharedmimepackage_in_files) - - --# update mime database --install-data-hook: -- test -z "$(UPDATE_MIME_DATABASE)" || $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(sharedmimedir)"; --uninstall-local: uninstall-sharedmimepackageDATA -- test -z "$(UPDATE_MIME_DATABASE)" || $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(sharedmimedir)"; -- -- - .PHONY: help todo stats splint - - todo:: -Index: src/lib/Makefile.in -=================================================================== ---- src/lib/Makefile.in.orig -+++ src/lib/Makefile.in -@@ -737,12 +737,6 @@ uninstall-am: uninstall-local uninstall- - @INTLTOOL_XML_RULE@ - buzztard.xml: buzztard.xml.in - --# update mime database --install-data-hook: -- test -z "$(UPDATE_MIME_DATABASE)" || $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(sharedmimedir)"; --uninstall-local: uninstall-sharedmimepackageDATA -- test -z "$(UPDATE_MIME_DATABASE)" || $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(sharedmimedir)"; -- - .PHONY: help todo stats splint - - todo:: -Index: src/ui/edit/Makefile.am -=================================================================== ---- src/ui/edit/Makefile.am.orig -+++ src/ui/edit/Makefile.am -@@ -115,12 +115,6 @@ marshal.c: marshal.list - CLEANFILES = $(desktop_DATA) $(BUILT_SOURCES) - EXTRA_DIST = $(desktop_in_files) $(gtkrc_DATA) marshal.list - --# update desktop database --install-data-hook: -- test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(desktopdir)"; --uninstall-local: -- test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(desktopdir)"; -- - .PHONY: help todo stats splint - - todo:: -Index: src/ui/edit/Makefile.in -=================================================================== ---- src/ui/edit/Makefile.in.orig -+++ src/ui/edit/Makefile.in -@@ -947,12 +947,6 @@ marshal.h: marshal.list - marshal.c: marshal.list - glib-genmarshal --body --prefix=bt_marshal $(srcdir)/marshal.list > marshal.c - --# update desktop database --install-data-hook: -- test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(desktopdir)"; --uninstall-local: -- test -z "$(UPDATE_DESKTOP_DATABASE)" || $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)$(desktopdir)"; -- - .PHONY: help todo stats splint - - todo:: diff --git a/buzztard-0.6.0-no_check.patch b/buzztard-0.6.0-no_check.patch deleted file mode 100644 index 085ba1d..0000000 --- a/buzztard-0.6.0-no_check.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -19817,8 +19817,8 @@ $as_echo "yes" >&6; } - - have_check=yes - if true; then -- BUILD_CHECK_TESTS_TRUE= -- BUILD_CHECK_TESTS_FALSE='#' -+ BUILD_CHECK_TESTS_TRUE='#' -+ BUILD_CHECK_TESTS_FALSE= - else - BUILD_CHECK_TESTS_TRUE='#' - BUILD_CHECK_TESTS_FALSE= diff --git a/buzztrax.spec b/buzztrax.spec index ba99768..45a944f 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -18,10 +18,13 @@ %define gir gobject-introspection-1.0 %define gstreamer_pluginsdir %(pkg-config --variable=pluginsdir gstreamer-1.0) -%define girdir %(pkg-config --variable=girdir %{gir}) +%define girdir %{_datadir}/gir %define typelibdir %(pkg-config --variable=typelibdir %{gir}) -%define core_soname 0 -%define ic_soname 0 +%define core_soname 1 +%define ic_soname 1 +%define girsoname 1.1 +%define gst_soname 1 +%define bml_soname 1 Name: buzztrax Version: 0.9.0 @@ -72,7 +75,7 @@ buzztrax aims to be a music studio that allows one to compose songs using only a computer with a soundcard. If you've used tracker programs like FastTracker, Impulse Tracker, or the original AMIGA SoundTracker, that will give you an idea -of how one can sequence music in Buzztard. The Buzztard +of how one can sequence music in Buzztrax. The Buzztrax editor uses a similar concept, where a song consists of a sequence with tracks and in each track one uses patterns with events (musical notes and control changes). In contrast @@ -82,12 +85,12 @@ 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-buzztraxdec -Summary: Buzztard GStreamer plugin +%package -n gstreamer-1_0-plugins +Summary: Buzztrax GStreamer plugin Group: Productivity/Multimedia/Other -%description -n gstreamer-1_0-plugins-buzztraxdec -Plugin to play Buzztard songs from any GStreamer compatible app. +%description -n gstreamer-1_0-plugins +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 @@ -104,6 +107,21 @@ Group: System/Libraries %description -n libbuzztrax-core%{core_soname} 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 + +%description -n libbuzztrax-gst%{gst_soname} +This package provides gst support classes for buzztrax based applications. + +%package -n libbuzztrax-gst-devel +Summary: Development files for libbuzztrax-gst +Group: Development/Libraries/C and C++ +Requires: libbuzztrax-gst%{gst_soname} = %{version} + +%description -n libbuzztrax-gst-devel +This package provides the development files for libbuzztrax-gst. + %package -n libbuzztrax-ic-devel Summary: Development files for libbuzztrax-ic Group: Development/Libraries/C and C++ @@ -120,19 +138,40 @@ Requires: libbuzztrax-core%{core_soname} = %{version} %description -n libbuzztrax-core-devel This package provides the development files for libbuzztrax-core. -%package -n typelib-1_0-BuzztardIc-0_0 -Summary: BuzztardIc introspection bindings +%package -n typelib-1_0-BuzztraxIc-1_1 +Summary: BuzztraxIc introspection bindings Group: System/Libraries -%description -n typelib-1_0-BuzztardIc-0_0 -This package provides the GObject Introspection bindings for BuzztardIc. +%description -n typelib-1_0-BuzztraxIc-1_1 +This package provides the GObject Introspection bindings for BuzztraxIc. -%package -n typelib-1_0-BuzztardCore-0_0 -Summary: BuzztardCore Introspection bindings +%package -n typelib-1_0-BuzztraxCore-1_1 +Summary: BuzztraxCore Introspection bindings Group: System/Libraries -%description -n typelib-1_0-BuzztardCore-0_0 -This package provides the GObject Introspection bindings for BuzztardCore. +%description -n typelib-1_0-BuzztraxCore-1_1 +This package provides the GObject Introspection bindings for BuzztraxCore. + +%package -n libbml%{bml_soname} +Summary: Core support classes for buzztrax based applications +Group: System/Libraries + +%description -n libbml%{bml_soname} +This package provides bml support classes for buzztrax based applications. + +%package -n libbml-devel +Summary: Development files for libbml +Group: Development/Libraries/C and C++ + +%description -n libbml-devel +This package provides the development files for libbml. + +%package plugins +Summary: Buzztrax GStreamer plugin +Group: Productivity/Multimedia/Other + +%description plugins +This package contains buzztrax plugins %prep %setup -q @@ -148,18 +187,28 @@ make %{?_smp_flags} %install %make_install -find %{buildroot}%{_libdir} -name '*.la' -delete -%find_lang %{name} -%find_gconf_schemas +# NOTE: There's libraries installed in unversioned libdir must investigate +find %{buildroot}%{_libdir} %{buildroot}%{_libexecdir} -name '*.la' -delete +echo %{buildroot} +%find_lang %{name}-%{version} +#%%find_gconf_schemas %fdupes -s %{buildroot} printf 'libbuzztrax-ic%{ic_soname}\n libbuzztrax-core%{core_soname}\n -typelib-1_0-BuzztardIc-0_0\n -\t+^%{typelibdir}/BuzztardIc-0.0.typelib$\n -typelib-1_0-BuzztardCore-0_0\n -\t+^%{typelibdir}/BuzztardCore-0.0.typelib$\n' > %{_sourcedir}/baselibs.conf +typelib-1_0-BuzztraxIc-1_1\n +\t+^%{typelibdir}/BuzztraxIc-%{girsoname}.typelib$\n +typelib-1_0-BuzztraxCore-1_1\n +\t+^%{typelibdir}/BuzztraxCore-%{girsoname}.typelib$\n' > %{_sourcedir}/baselibs.conf +# Anything that doesn't work goes here +%if 1 == 0 %pre -f %{name}.schemas_pre + -f %{name}.schemas_list +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%endif %post %icon_theme_cache_post @@ -167,25 +216,21 @@ typelib-1_0-BuzztardCore-0_0\n %mime_database_post %desktop_database_post -%preun -f %{name}.schemas_preun - %postun %desktop_database_postun %mime_database_postun %icon_theme_cache_postun gnome %icon_theme_cache_postun -%posttrans -f %{name}.schemas_posttrans - %post -n libbuzztrax-ic%{ic_soname} -p /sbin/ldconfig %post -n libbuzztrax-core%{core_soname} -p /sbin/ldconfig %postun -n libbuzztrax-ic%{ic_soname} -p /sbin/ldconfig %postun -n libbuzztrax-core%{core_soname} -p /sbin/ldconfig -%files -f buzztrax-0.6.lang -f %{name}.schemas_list +%files -f buzztrax-%{version}.lang %defattr(0644,root,root,0755) -%doc AUTHORS COPYING COPYING-DOCS NEWS README TODO +%doc AUTHORS COPYING COPYING-DOCS NEWS README.md TODO %attr(0755,root,root) %{_bindir}/* %{_datadir}/buzztrax/ %{_datadir}/applications/buzztrax-edit.desktop @@ -199,10 +244,17 @@ typelib-1_0-BuzztardCore-0_0\n %{_datadir}/mime/packages/buzztrax.xml %attr(0644,root,root) %ghost %{_datadir}/mime/audio/x-bzt.xml %attr(0644,root,root) %ghost %{_datadir}/mime/audio/x-bzt-xml.xml +# NOTE: These files need a proper home and correct handling. +%{_libexecdir}/buzztrax-songio/libbtbsl.so +%{_datadir}/GConf/gsettings/buzztrax.convert +%{_datadir}/appdata/buzztrax.appdata.xml +%{_datadir}/applications/buzztrax-songio-buzz.desktop +%{_datadir}/glib-2.0/schemas/org.buzztrax.gschema.xml +%{_datadir}/mime/packages/buzztrax-songio-buzz.xml -%files -n gstreamer-1_0-plugins-buzztraxdec +%files -n gstreamer-1_0-plugins %defattr(0644,root,root,0755) -%{gstreamer_pluginsdir}/libbuzztraxdec.so +%{gstreamer_pluginsdir}/lib*.so %files -n libbuzztrax-ic%{ic_soname} %defattr(0644,root,root,0755) @@ -217,7 +269,7 @@ typelib-1_0-BuzztardCore-0_0\n %{_includedir}/libbuzztrax-ic/ %{_libdir}/libbuzztrax-ic.so %{_libdir}/pkgconfig/libbuzztrax-ic.pc -%{girdir}/BuzztardIc-0.0.gir +%{girdir}/BuzztraxIc-%{girsoname}.gir %{_datadir}/gtk-doc/html/buzztrax-ic/ %files -n libbuzztrax-core-devel @@ -225,15 +277,41 @@ typelib-1_0-BuzztardCore-0_0\n %{_includedir}/libbuzztrax-core/ %{_libdir}/libbuzztrax-core.so %{_libdir}/pkgconfig/libbuzztrax-core.pc -%{girdir}/BuzztardCore-0.0.gir +%{girdir}/BuzztraxCore-%{girsoname}.gir %{_datadir}/gtk-doc/html/buzztrax-core/ -%files -n typelib-1_0-BuzztardIc-0_0 +%files -n typelib-1_0-BuzztraxIc-1_1 %defattr(0644,root,root,0755) -%{typelibdir}/BuzztardIc-0.0.typelib +%{typelibdir}/BuzztraxIc-%{girsoname}.typelib -%files -n typelib-1_0-BuzztardCore-0_0 +%files -n typelib-1_0-BuzztraxCore-1_1 %defattr(0644,root,root,0755) -%{typelibdir}/BuzztardCore-0.0.typelib +%{typelibdir}/BuzztraxCore-%{girsoname}.typelib + +%files -n libbuzztrax-gst%{gst_soname} +%defattr(0644,root,root,0755) +%{_libdir}/libbuzztrax-gst.so.%{gst_soname}* + +%files -n libbuzztrax-gst-devel +%defattr(0644,root,root,0755) +%{_libdir}/libbuzztrax-gst.so +%{_includedir}/libbuzztrax-gst/* +%{_datadir}/gtk-doc/html/buzztrax-gst/ +%{_libdir}/pkgconfig/libbuzztrax-gst.pc + +%files -n libbml%{bml_soname} +%defattr(0644,root,root,0755) +%{_libdir}/libbml.so.%{bml_soname}* + +%files -n libbml-devel +%defattr(0644,root,root,0755) +%{_libdir}/libbml.so +%{_includedir}/libbml/* +%{_libdir}/pkgconfig/libbml.pc + +%files plugins +%defattr(0644,root,root,0755) +%{_libdir}/%{name}/ + %changelog