diff --git a/0001-build-Fix-missing-TOTEM_PL_PARSER_CHECK_VERSION-macr.patch b/0001-build-Fix-missing-TOTEM_PL_PARSER_CHECK_VERSION-macr.patch new file mode 100644 index 0000000..b6cc309 --- /dev/null +++ b/0001-build-Fix-missing-TOTEM_PL_PARSER_CHECK_VERSION-macr.patch @@ -0,0 +1,31 @@ +From cd8cec1cf7e16decf4733552b78e7c842c9833a7 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Thu, 22 Jun 2017 18:20:50 +0200 +Subject: [PATCH] build: Fix missing TOTEM_PL_PARSER_CHECK_VERSION macro + +Use totem-pl-parser-features.h.in as base to generate +totem-pl-parser-features.h so that TOTEM_PL_PARSER_CHECK_VERSION is +present. + +https://bugzilla.gnome.org/show_bug.cgi?id=784098 +--- + plparse/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plparse/meson.build b/plparse/meson.build +index bfc95c5..bd8bac5 100644 +--- a/plparse/meson.build ++++ b/plparse/meson.build +@@ -12,7 +12,8 @@ version_cdata = configuration_data() + version_cdata.set('TOTEM_PL_PARSER_VERSION_MAJOR', plparse_major_version) + version_cdata.set('TOTEM_PL_PARSER_VERSION_MINOR', plparse_minor_version) + version_cdata.set('TOTEM_PL_PARSER_VERSION_MICRO', plparse_micro_version) +-features_h = configure_file(output: 'totem-pl-parser-features.h', ++features_h = configure_file(input: 'totem-pl-parser-features.h.in', ++ output: 'totem-pl-parser-features.h', + install_dir: 'include/totem-pl-parser/1/plparser', + configuration: version_cdata) + +-- +2.13.0 + diff --git a/totem-pl-parser.spec b/totem-pl-parser.spec index 673f405..e6a5d28 100644 --- a/totem-pl-parser.spec +++ b/totem-pl-parser.spec @@ -1,12 +1,15 @@ Name: totem-pl-parser Version: 3.25.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Totem Playlist Parser library License: LGPLv2+ Url: https://wiki.gnome.org/Apps/Videos Source0: https://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-build-Fix-missing-TOTEM_PL_PARSER_CHECK_VERSION-macr.patch + BuildRequires: glib2-devel BuildRequires: gmime-devel BuildRequires: libxml2-devel @@ -31,7 +34,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build %meson -Denable-gtk-doc=true @@ -67,6 +70,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/totem-pl-parser.spec %{_datadir}/gir-1.0/*.gir %changelog +* Mon Jul 31 2017 Kalev Lember - 3.25.3-3 +- Backport an upstream patch to fix rhythmbox build + * Mon Jul 31 2017 Florian Weimer - 3.25.3-2 - Rebuild with binutils fix for ppc64le (#1475636)