Hello community, here is the log from the commit of package buzztrax for openSUSE:Factory checked in at 2019-08-22 10:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/buzztrax (Old) and /work/SRC/openSUSE:Factory/.buzztrax.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "buzztrax" Thu Aug 22 10:49:33 2019 rev:15 rq:722311 version:0.10.2+git20190809 Changes: -------- --- /work/SRC/openSUSE:Factory/buzztrax/buzztrax.changes 2019-07-11 13:18:58.410756427 +0200 +++ /work/SRC/openSUSE:Factory/.buzztrax.new.22127/buzztrax.changes 2019-08-22 10:49:39.657721718 +0200 @@ -1,0 +2,13 @@ +Sun Aug 11 08:14:05 UTC 2019 - Dave Plater <[email protected]> + +- Update to git snapshot version 0.10.2+git20190809 which no longer + uses rarian-scrollkeeper but uses yelp instead for help file + generation. +- This fixes boo#1141385. +- Removed the following incorporated patches: + buzztrax-appdata.patch, buzztrax-build.patch, + buzztrax-gcc7fix.patch, buzztrax-misleading-indentation.patch + and buzztrax-newfix.patch. +- Added -Wno-error=format for the i586 build. + +------------------------------------------------------------------- Old: ---- buzztrax-0.10.2.tar.gz buzztrax-appdata.patch buzztrax-build.patch buzztrax-gcc7fix.patch buzztrax-misleading-indentation.patch buzztrax-newfix.patch New: ---- buzztrax-0.10.2+git20190809.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ buzztrax.spec ++++++ --- /var/tmp/diff_new_pack.gJu0Qq/_old 2019-08-22 10:49:41.029721534 +0200 +++ /var/tmp/diff_new_pack.gJu0Qq/_new 2019-08-22 10:49:41.029721534 +0200 @@ -16,6 +16,9 @@ # +%define rev eb51b04c45f075577f71199d3a62c8fc6c5996f2 +%define relver 0.11.0 + %define gir gobject-introspection-1.0 %define gstreamer_pluginsdir %(pkg-config --variable=pluginsdir gstreamer-1.0) %define girdir %{_datadir}/gir-1.0 @@ -28,43 +31,33 @@ %define glib_version 2.32.0 %define gst_version 1.2.0 Name: buzztrax -Version: 0.10.2 +Version: 0.10.2+git20190809 Release: 0 Summary: A music studio inspired by Buzz License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Utilities Url: http://buzztrax.org -Source0: http://files.buzztrax.org/releases/%{name}-%{version}.tar.gz +Source0: https://github.com/Buzztrax/buzztrax/archive//%{rev}.tar.gz#/%{name}-%{version}.tar.gz +#http://files.buzztrax.org/releases/%%{name}-%%{version}.tar.gz Source1: autogen.sh Source2: COPYING-DOCS -# Combined patch of cherry picked build fixes applies after 0.10.2 -Patch0: buzztrax-build.patch -Patch1: buzztrax-appdata.patch -# PATCH-FIX gcc6 error misleading-indentation with patch from git. -Patch2: buzztrax-misleading-indentation.patch -# PATCH-FIX-UPSTREAM buzztrax-gcc7fix.patch [email protected] -- fix gcc 7 duplicate constant errors -Patch3: buzztrax-gcc7fix.patch -Patch4: buzztrax-newfix.patch BuildRequires: automake >= 1.13 BuildRequires: desktop-file-utils BuildRequires: fdupes -%if 0%{?suse_version} > 1320 BuildRequires: gcc-c++ -%else -BuildRequires: gcc8-c++ -%endif BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: scrollkeeper BuildRequires: shared-mime-info BuildRequires: pkgconfig(%{gir}) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(clutter-gtk-1.0) #BuildRequires: pkgconfig(fluidsynth) +BuildRequires: yelp-devel +BuildRequires: yelp-tools BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib_version} @@ -197,6 +190,10 @@ Summary: Buzztrax plugins Group: Productivity/Multimedia/Other Requires: buzztrax = %{version} +Requires: libbml%{bml_soname} = %{version} +Requires: libbuzztrax-core%{core_soname} = %{version} +Requires: libbuzztrax-gst%{gst_soname} = %{version} +Requires: libbuzztrax-ic%{ic_soname} = %{version} %description plugins This package contains buzztrax plugins @@ -204,21 +201,23 @@ %lang_package %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 +%setup -q -n %{name}-%{rev} +%autopatch -p1 # Rpmlint complains that COPYING-DOCS is outdated cp -v %{SOURCE2} . cp -v %{SOURCE1} . +if ! `test -a AUTHORS`; then +touch AUTHORS +fi %build test -x "$(type -p gcc-8)" && export CC="$_" test -x "$(type -p g++-8)" && export CXX="$_" export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict" +%ifarch i586 +export CFLAGS="$CFLAGS -Wno-error=format" +%endif export CXXFLAGS="$CFLAGS" /bin/sh ./autogen.sh --noconfigure @@ -230,7 +229,9 @@ --disable-rpath \ --with-pic \ --enable-man \ - --disable-dllwrapper + --disable-dllwrapper \ + --enable-gtk-doc +cp -v docs/version.entities docs/help/bt-edit/C/ make %{?_smp_mflags} @@ -238,14 +239,14 @@ %make_install find %{buildroot} -type f -name "*.la" -delete -print echo %{buildroot} -%find_lang %{name}-%{version} +%find_lang %{name}-%{relver} mv %{buildroot}%{_datadir}/applications/buzztrax-edit.desktop %{buildroot}%{_datadir}/applications/buzztrax.desktop #%%find_gconf_schemas # ensure the icons in hicolor are the REAL files. fdupes links them the 'wrong way around' for xdg-app and appstream-builder for icon in 48x48/apps/buzztrax.png scalable/apps/buzztrax.svg; do ln -sf %{_datadir}/icons/hicolor/${icon} %{buildroot}%{_datadir}/icons/gnome/${icon} done -%fdupes -s %{buildroot} +%fdupes -s %{buildroot}/%{_datadir}/ # WARNING: this creates baselibs.conf printf 'libbuzztrax-ic%{ic_soname}\n libbuzztrax-core%{core_soname}\n @@ -315,11 +316,8 @@ %{_datadir}/appdata/buzztrax.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/gnome -%dir %{_datadir}/omf -%dir %{_datadir}/omf/buzztrax-edit -%doc %{_datadir}/omf/buzztrax-edit/ -%dir %{_datadir}/gnome/ -%doc %{_datadir}/gnome/help/ +%{_datadir}/help/C +%{_mandir}/man1/* %dir %{_datadir}/gtk-doc/html/buzztrax-cmd %dir %{_datadir}/gtk-doc/html/buzztrax-edit %{_datadir}/gtk-doc/html/buzztrax-cmd/ @@ -405,7 +403,7 @@ %dir %{_libdir}/buzztrax-songio %{_libdir}/buzztrax-songio/*.so -%files lang -f buzztrax-%{version}.lang +%files lang -f %{name}-%{relver}.lang %defattr (-, root, root) %changelog
