- added deps patch (don't require grilo-plugins at build time), updated dependencies...

diff --git a/gnome-music-deps.patch b/gnome-music-deps.patch
new file mode 100644 (file)
index 0000000..c74ccb0
--- /dev/null
+++ b/gnome-music-deps.patch
@@ -0,0 +1,10 @@
+--- gnome-music-3.34.1/meson.build.orig        2019-10-25 17:59:21.000000000 +0200
++++ gnome-music-3.34.1/meson.build     2019-11-17 21:12:14.293499427 +0100
+@@ -46,7 +46,6 @@
+ dependency('pygobject-3.0', version: '>= 3.29.1')
+ dependency('py3cairo', version: '>= 1.14.0')
+ dependency('grilo-0.3', version: '>= 0.3.9')
+-dependency('grilo-plugins-0.3', version: '>= 0.3.9')
+ 
+ subproject('libgd',
+     default_options: [

diff --git a/gnome-music.spec b/gnome-music.spec
index 7d6755d98f7f535c9369e3b1bf4e6bd9ff2236ec..5859878ac7f0c5b3c37af0f87ceaf0c30ac22122 100644 (file)
--- a/gnome-music.spec
+++ b/gnome-music.spec
@@ -2,47 +2,52 @@ Summary:      Music player for GNOME
 Summary(pl.UTF-8):     Odtwarzacz muzyki dla GNOME
 Name:          gnome-music
 Version:       3.34.1
-Release:       1
-License:       GPL v2 with exceptions
+Release:       2
+License:       GPL v2 with GStreamer plugins exceptions
 Group:         X11/Applications/Multimedia
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-music/3.34/%{name}-%{version}.tar.xz
 # Source0-md5: b4d13ebdd34e8d1c7043d6d4ddec983f
+Patch0:                %{name}-deps.patch
 URL:           http://wiki.gnome.org/Apps/Music
 BuildRequires: gettext-tools
+BuildRequires: gnome-online-accounts-devel >= 3
 BuildRequires: gobject-introspection-devel >= 1.36.0
-BuildRequires: grilo-devel >= 0.3.4
-BuildRequires: grilo-plugins
-BuildRequires: gtk+3-devel >= 3.20.0
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libdazzle-devel
+BuildRequires: grilo-devel >= 0.3.9
+BuildRequires: gtk+3-devel >= 3.24.7
+BuildRequires: libdazzle-devel >= 3.28.0
 BuildRequires: libmediaart2-devel >= 1.9.1
-BuildRequires: meson
+BuildRequires: libsoup-devel >= 2.4
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig >= 1:0.22
 BuildRequires: python3-devel >= 1:3.3
 BuildRequires: python3-pycairo-devel >= 1.14.0
-BuildRequires: python3-pygobject3-devel >= 3.22
+BuildRequires: python3-pygobject3-devel >= 3.30
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
-BuildRequires: tracker-devel >= 2.0.0
+BuildRequires: tracker-devel >= 2.2.0
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires(post,postun): glib2 >= 1:2.26.0
 Requires(post,postun): gtk-update-icon-cache
 Requires:      gdk-pixbuf2
 Requires:      glib2
-Requires:      grilo >= 0.3.4
-Requires:      grilo-plugins >= 0.3.1
+Requires:      gobject-introspection >= 1.36.0
+Requires:      grilo >= 0.3.9
+Requires:      grilo-plugins >= 0.3.9
 Requires:      gstreamer >= 1.0.0
 Requires:      gstreamer-plugins-base >= 1.0.0
-Requires:      gtk+3 >= 3.20.0
+Requires:      gtk+3 >= 3.24.7
 Requires:      hicolor-icon-theme
+Requires:      libdazzle >= 3.28.0
 Requires:      libmediaart2 >= 1.9.1
 Requires:      libnotify
 Requires:      python3-dbus
-Requires:      python3-pycairo
-Requires:      python3-pygobject3 >= 3.22
+Requires:      python3-pycairo >= 1.14.0
+Requires:      python3-pygobject3 >= 3.30
 Requires:      python3-requests
-Requires:      tracker-libs >= 2.0.0
+Requires:      tracker-libs >= 2.2.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,17 +58,19 @@ GNOME Music to odtwarzacz muzyki dla GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
 
-%{__sed} -i -e '1s,/usr/bin/env python3,/usr/bin/python3,' gnome-music.in
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' gnome-music.in
 
 %build
 %meson build
-%meson_build -C build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %find_lang org.gnome.Music --with-gnome --all-name
 
@@ -80,14 +87,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f org.gnome.Music.lang
 %defattr(644,root,root,755)
-%doc NEWS README.md
+%doc LICENSE NEWS README.md
 %attr(755,root,root) %{_bindir}/gnome-music
 %dir %{_libdir}/org.gnome.Music
+%attr(755,root,root) %{_libdir}/org.gnome.Music/libgd.so
+%attr(755,root,root) %{_libdir}/org.gnome.Music/libgfm-0.1.so
 %dir %{_libdir}/org.gnome.Music/girepository-1.0
 %{_libdir}/org.gnome.Music/girepository-1.0/Gd-1.0.typelib
-%attr(755,root,root) %{_libdir}/org.gnome.Music/libgd.so
-%{_datadir}/metainfo/org.gnome.Music.appdata.xml
+%{_libdir}/org.gnome.Music/girepository-1.0/Gfm-0.1.typelib
+%dir %{_libdir}/org.gnome.Music/pkgconfig
+%{_libdir}/org.gnome.Music/pkgconfig/gfm-0.1.pc
 %{_datadir}/glib-2.0/schemas/org.gnome.Music.gschema.xml
+%{_datadir}/metainfo/org.gnome.Music.appdata.xml
 %{_datadir}/org.gnome.Music
 %{_desktopdir}/org.gnome.Music.desktop
 %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg