Upgrade to v1.13.1

Resolves: RHEL-72785
This commit is contained in:
Wim Taymans 2025-03-14 15:59:20 +01:00
parent 59c73e506d
commit 3444269701
5 changed files with 53 additions and 49 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1 +1 @@
SHA512 (taglib-1.12.tar.gz) = 7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba
SHA512 (taglib-1.13.1.tar.gz) = 986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b

View File

@ -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

View File

@ -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

View File

@ -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 <wtaymans@redhat.com> - 1.13.1-1
- Upgrade to v1.13.1
Resolves: RHEL-72785
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 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 <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
- -BR: automake
- -BR: automake
- +BR: zlib-devel
* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn