Update to 1.12 (#1584870)

This commit is contained in:
David King 2021-02-16 09:59:47 +00:00
parent 2d68a1a4a6
commit 629ec1c059
5 changed files with 28 additions and 30 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

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

View File

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