From 3444269701530120ec56fcf3a9cdae91b58dee6a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 14 Mar 2025 15:59:20 +0100 Subject: [PATCH] Upgrade to v1.13.1 Resolves: RHEL-72785 --- .gitignore | 1 + sources | 2 +- taglib-1.12-multilib.patch | 31 ------------------------------- taglib-1.13.1-multilib.patch | 36 ++++++++++++++++++++++++++++++++++++ taglib.spec | 32 +++++++++++++++----------------- 5 files changed, 53 insertions(+), 49 deletions(-) delete mode 100644 taglib-1.12-multilib.patch create mode 100644 taglib-1.13.1-multilib.patch diff --git a/.gitignore b/.gitignore index 9eebd54..e790b60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /taglib-1.11.tar.gz /taglib-1.11.1.tar.gz /taglib-1.12.tar.gz +/taglib-1.13.1.tar.gz diff --git a/sources b/sources index fe030ff..050d3c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (taglib-1.12.tar.gz) = 7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba +SHA512 (taglib-1.13.1.tar.gz) = 986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b diff --git a/taglib-1.12-multilib.patch b/taglib-1.12-multilib.patch deleted file mode 100644 index 87cf910..0000000 --- a/taglib-1.12-multilib.patch +++ /dev/null @@ -1,31 +0,0 @@ -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@ --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 @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-1.13.1-multilib.patch b/taglib-1.13.1-multilib.patch new file mode 100644 index 0000000..02aa21e --- /dev/null +++ b/taglib-1.13.1-multilib.patch @@ -0,0 +1,36 @@ +diff -up taglib-1.13.1/taglib-config.cmake.multilib taglib-1.13.1/taglib-config.cmake +--- taglib-1.13.1/taglib-config.cmake.multilib 2025-01-04 15:22:01.000000000 +0100 ++++ taglib-1.13.1/taglib-config.cmake 2023-07-01 07:43:27.000000000 +0200 +@@ -23,11 +23,6 @@ if test -z "$prefix"; then + else + includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + fi +-if test -z "$exec_prefix"; then +- libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +-else +- libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-fi + + flags="" + +@@ -39,7 +34,7 @@ while test $# -gt 0 + do + case $1 in + --libs) +- flags="$flags -L$libdir -ltag @ZLIB_LIBRARIES_FLAGS@" ++ flags="$flags -ltag" + ;; + --cflags) + flags="$flags -I$includedir -I$includedir/taglib" + +diff -up taglib-1.13.1/taglib.pc.cmake.multilib taglib-1.13.1/taglib.pc.cmake +--- taglib-1.13.1/taglib.pc.cmake.multilib 2025-01-04 15:23:10.000000000 +0100 ++++ taglib-1.13.1/taglib.pc.cmake 2023-07-01 07:43:27.000000000 +0200 +@@ -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 3a5b126..af6db1b 100644 --- a/taglib.spec +++ b/taglib.spec @@ -5,27 +5,21 @@ #bcond_without doc %global apidocdir __api-doc_fedora -Name: taglib +Name: taglib Summary: Audio Meta-Data Library -Version: 1.12 -Release: 12%{?dist} +Version: 1.13.1 +Release: 1%{?dist} -License: LGPLv2 or MPLv1.1 -URL: http://taglib.github.io/ -%if 0%{?snap:1} -Source0: taglib-%{version}-%{snap}.tar.gz -%else -Source0: http://taglib.github.io/releases/taglib-%{version}%{?beta}.tar.gz -%endif -# The snapshot tarballs generated with the following script: -Source1: taglib-snapshot.sh +License: (LGPL-2.1-only OR MPL-1.1) AND BSD-2-Clause AND LGPL-2.1-only +URL: https://taglib.github.io/ +Source0: https://taglib.github.io/releases/taglib-%{version}%{?beta}.tar.gz # 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 +Patch0: taglib-1.13.1-multilib.patch -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -50,7 +44,7 @@ BuildArch: noarch This is API documentation generated from the TagLib source code. %package devel -Summary: Development files for %{name} +Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %if ! %{with doc} Obsoletes: %{name}-doc < %{version}-%{release} @@ -122,6 +116,10 @@ test "$(pkg-config --modversion taglib_c)" = "%{version}" %changelog +* Fri Mar 14 2025 Wim Taymans - 1.13.1-1 +- Upgrade to v1.13.1 + Resolves: RHEL-72785 + * Tue Oct 29 2024 Troy Dawson - 1.12-12 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 @@ -405,7 +403,7 @@ test "$(pkg-config --modversion taglib_c)" = "%{version}" - svn20071111 snapshot (#376241) * Thu Sep 27 2007 Rex Dieter 1.5-0.5.20070924svn -- -BR: automake +- -BR: automake - +BR: zlib-devel * Thu Sep 27 2007 Rex Dieter 1.5-0.4.20070924svn