Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/taglib.git#f5696ff90c6fb9a0f392b806772346e805a5adf2

.gitignore

@@ -1,2 +1,3 @@
 /taglib-1.11.tar.gz
 /taglib-1.11.1.tar.gz
+/taglib-1.12.tar.gz

0001-Don-t-assume-TDRC-is-an-instance-of-TextIdentificati.patch

@@ -1,33 +0,0 @@
-From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
-From: "Stephen F. Booth" <me@sbooth.org>
-Date: Sun, 23 Jul 2017 10:11:09 -0400
-Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
-
-If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
-which causes problems in rebuildAggregateFrames() when it is assumed
-that TDRC is a TextIdentificationFrame
----
- taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-index 759a9b7b..9347ab86 100644
---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
-+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
-      tag->frameList("TDAT").size() == 1)
-   {
-     TextIdentificationFrame *tdrc =
--      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-+      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
- 
--    if(tdrc->fieldList().size() == 1 &&
-+    if(tdrc &&
-+       tdrc->fieldList().size() == 1 &&
-        tdrc->fieldList().front().size() == 4 &&
-        tdat->data().size() >= 5)
-     {
--- 
-2.13.5
-

sources

@@ -1 +1 @@
-cee7be0ccfc892fa433d6c837df9522a  taglib-1.11.1.tar.gz
+SHA512 (taglib-1.12.tar.gz) = 7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba

taglib-1.12-multilib.patch

@@ -0,0 +1,20 @@
+diff -urN taglib-1.12.old/taglib-config.cmake taglib-1.12/taglib-config.cmake
+--- taglib-1.12.old/taglib-config.cmake	2021-02-15 11:23:07.000000000 +0000
++++ taglib-1.12/taglib-config.cmake	2021-02-16 09:18:07.018627259 +0000
+@@ -16,7 +16,6 @@
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
+ includedir=@INCLUDE_INSTALL_DIR@
+ 
+ flags=""
+@@ -29,7 +28,7 @@
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir -ltag @ZLIB_LIBRARIES_FLAGS@"
++	  flags="$flags -ltag @ZLIB_LIBRARIES_FLAGS@"
+ 	  ;;
+     --cflags)
+ 	  flags="$flags -I$includedir -I$includedir/taglib"

taglib-1.5rc1-multilib.patch

@@ -1,20 +0,0 @@
-diff -up taglib-1.5rc1/taglib-config.cmake.multilib-2 taglib-1.5rc1/taglib-config.cmake
---- taglib-1.5rc1/taglib-config.cmake.multilib-2	2008-01-29 19:30:00.000000000 -0600
-+++ taglib-1.5rc1/taglib-config.cmake	2008-02-13 06:41:11.000000000 -0600
-@@ -16,7 +16,6 @@ EOH
- 
- prefix=${CMAKE_INSTALL_PREFIX}
- exec_prefix=${CMAKE_INSTALL_PREFIX}
--libdir=${LIB_INSTALL_DIR}
- includedir=${INCLUDE_INSTALL_DIR}
- 
- flags=""
-@@ -29,7 +28,7 @@ while test $# -gt 0
- do
-   case $1 in
-     --libs)
--	  flags="$flags -L$libdir -ltag"
-+	  flags="$flags -ltag"
- 	  ;;
-     --cflags)
- 	  flags="$flags -I$includedir/taglib"

taglib.spec

@@ -7,11 +7,10 @@
 
 Name:       taglib	
 Summary:    Audio Meta-Data Library
-Version:    1.11.1
-Release:    14%{?dist}
+Version:    1.12
+Release:    1%{?dist}
 
 License:    LGPLv2 or MPLv1.1
-#URL:       http://launchpad.net/taglib
 URL:        http://taglib.github.io/
 %if 0%{?snap:1}
 Source0:    taglib-%{version}-%{snap}.tar.gz
@@ -22,12 +21,7 @@ Source0:    http://taglib.github.io/releases/taglib-%{version}%{?beta}.tar.gz
 Source1:    taglib-snapshot.sh
 
 # http://bugzilla.redhat.com/343241
-Patch102:   taglib-1.5rc1-multilib.patch
-
-## upstream patches
-# sbooth fork/pull-request
-# https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6
-Patch1: 0001-Don-t-assume-TDRC-is-an-instance-of-TextIdentificati.patch
+Patch0:     taglib-1.12-multilib.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -127,6 +121,9 @@ test "$(pkg-config --modversion taglib_c)" = "%{version}"
 
 
 %changelog
+* Tue Feb 16 2021 David King <amigadave@amigadave.com> - 1.12-1
+- Update to 1.12 (#1584870)
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild