Accepting request 765867 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/765867
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/taglib?expand=0&rev=58

0001-Changed-libdir-includedir-variables-to-change-based-.patch

@@ -0,0 +1,28 @@
+From ef690d77afc97df50fea6ecdf6e2cbadcff970ea Mon Sep 17 00:00:00 2001
+From: jiblime <47689567+jiblime@users.noreply.github.com>
+Date: Sat, 19 Oct 2019 15:12:03 -0700
+Subject: [PATCH] Changed libdir/includedir variables to change based on a
+ user's system and match syntax
+
+---
+ taglib-config.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/taglib-config.cmake b/taglib-config.cmake
+index 96ef688..1e184c1 100644
+--- a/taglib-config.cmake
++++ b/taglib-config.cmake
+@@ -16,8 +16,8 @@ EOH
+ 
+ prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+ 
+ flags=""
+ 
+-- 
+2.24.1
+

taglib.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 20 12:30:24 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add patch to get the right directories when running taglib-config:
+  * 0001-Changed-libdir-includedir-variables-to-change-based-.patch
+
 -------------------------------------------------------------------
 Wed Aug 14 07:57:12 UTC 2019 - tchvatal@suse.com
 

taglib.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package taglib
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,8 @@ Source0:        %{sname}-%{version}.tar.xz
 Source1:        %{sname}.desktop
 Source100:      baselibs.conf
 Patch0:         taglib-versionbump.patch
+# PATCH-FIX-UPSTREAM https://github.com/taglib/taglib/pull/935
+Patch1:         0001-Changed-libdir-includedir-variables-to-change-based-.patch
 BuildRequires:  cmake >= 2.8
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -114,6 +116,7 @@ This package contains the taglib API Documentation in HTML format.
 %prep
 %setup -q -n %{sname}-%{version}
 %patch0
+%patch1 -p1
 
 %build
 # The testing needs static libs too