From 02041ee65e5b8c6655256a5c5ee7b8fe8ebf45fa Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 24 Mar 2021 22:35:19 +0000
Subject: [PATCH] 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#aa712ef1edefb5bfeb856f0c16ebcb93dff7631d
---
 taglib-1.12-multilib.patch | 23 +++++++++++++++++------
 taglib.spec                |  6 +++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/taglib-1.12-multilib.patch b/taglib-1.12-multilib.patch
index 4bde682..cc50f9a 100644
--- a/taglib-1.12-multilib.patch
+++ b/taglib-1.12-multilib.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -up taglib-1.12/taglib-config.cmake.multilib taglib-1.12/taglib-config.cmake
+--- taglib-1.12/taglib-config.cmake.multilib	2021-02-15 05:23:07.000000000 -0600
++++ taglib-1.12/taglib-config.cmake	2021-03-03 10:16:46.584430893 -0600
+@@ -16,7 +16,6 @@ EOH
  
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -9,12 +9,23 @@ diff -urN taglib-1.12.old/taglib-config.cmake taglib-1.12/taglib-config.cmake
  includedir=@INCLUDE_INSTALL_DIR@
  
  flags=""
-@@ -29,7 +28,7 @@
+@@ -29,7 +28,7 @@ while test $# -gt 0
  do
    case $1 in
      --libs)
 -	  flags="$flags -L$libdir -ltag @ZLIB_LIBRARIES_FLAGS@"
-+	  flags="$flags -ltag @ZLIB_LIBRARIES_FLAGS@"
++	  flags="$flags -ltag
  	  ;;
      --cflags)
  	  flags="$flags -I$includedir -I$includedir/taglib"
+diff -up taglib-1.12/taglib.pc.cmake.multilib taglib-1.12/taglib.pc.cmake
+--- taglib-1.12/taglib.pc.cmake.multilib	2021-02-15 05:23:07.000000000 -0600
++++ taglib-1.12/taglib.pc.cmake	2021-03-03 10:20:26.682249784 -0600
+@@ -7,5 +7,6 @@ Name: TagLib
+ Description: Audio meta-data library
+ Requires: 
+ Version: @TAGLIB_LIB_VERSION_STRING@
+-Libs: -L${libdir} -ltag @ZLIB_LIBRARIES_FLAGS@
++Libs: -L${libdir} -ltag
++Libs.private: @ZLIB_LIBRARIES_FLAGS@
+ Cflags: -I${includedir} -I${includedir}/taglib
diff --git a/taglib.spec b/taglib.spec
index 6ec4166..2457c2d 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -8,7 +8,7 @@
 Name:       taglib	
 Summary:    Audio Meta-Data Library
 Version:    1.12
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 License:    LGPLv2 or MPLv1.1
 URL:        http://taglib.github.io/
@@ -21,6 +21,7 @@ Source0:    http://taglib.github.io/releases/taglib-%{version}%{?beta}.tar.gz
 Source1:    taglib-snapshot.sh
 
 # http://bugzilla.redhat.com/343241
+# fix multilib, and drop -lz flag to consumers (probably only needed for static linking)
 Patch0:     taglib-1.12-multilib.patch
 
 BuildRequires:  gcc
@@ -121,6 +122,9 @@ test "$(pkg-config --modversion taglib_c)" = "%{version}"
 
 
 %changelog
+* Wed Mar 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.12-3
+- -devel: fix/drop -lz references in taglib-config, taglib.pc
+
 * Tue Feb 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.12-2
 - use versioned obsoletes