From a874440dbaffad4ed8223a1cdb2aa556ce0fc8b2513705cc7b633d64e73ba048 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 8 Nov 2012 06:05:42 +0000 Subject: [PATCH] Accepting request 140603 from home:klaussfreire:branches:multimedia:libs It seems taglib 1.8 forgot to update version defines. Found this trying to adapt python-tagpy to 1.8, noticed wrong defines (still saying 1.7). It could conceivably rain on dependencies, but only if they're checking those defines the wrong way (ie: if version == 1.7 instead of >= 1.8). Doubtful. OBS-URL: https://build.opensuse.org/request/show/140603 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=43 --- taglib-1.8-version_fix.patch | 12 ++++++++++++ taglib.changes | 6 ++++++ taglib.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 taglib-1.8-version_fix.patch diff --git a/taglib-1.8-version_fix.patch b/taglib-1.8-version_fix.patch new file mode 100644 index 0000000..c8fb085 --- /dev/null +++ b/taglib-1.8-version_fix.patch @@ -0,0 +1,12 @@ +diff -ur taglib-1.8/taglib/toolkit/taglib.h taglib-1.8.nu/taglib/toolkit/taglib.h +--- taglib-1.8/taglib/toolkit/taglib.h 2012-09-06 15:03:15.000000000 -0300 ++++ taglib-1.8.nu/taglib/toolkit/taglib.h 2012-11-08 01:47:51.088000009 -0300 +@@ -27,7 +27,7 @@ + #define TAGLIB_H + + #define TAGLIB_MAJOR_VERSION 1 +-#define TAGLIB_MINOR_VERSION 7 ++#define TAGLIB_MINOR_VERSION 8 + #define TAGLIB_PATCH_VERSION 0 + + #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)) diff --git a/taglib.changes b/taglib.changes index 99641c3..146a20f 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 8 04:49:38 UTC 2012 - klaussfreire@gmail.com + +- Add patch taglib-1.8-version_fix.patch: fix version defines + in taglib.h + ------------------------------------------------------------------- Thu Sep 13 10:11:52 UTC 2012 - cgiboudeaux@gmx.com diff --git a/taglib.spec b/taglib.spec index b2b62fc..070c88a 100644 --- a/taglib.spec +++ b/taglib.spec @@ -28,6 +28,8 @@ Source1: %{name}.desktop Source100: baselibs.conf Patch0: taglib-1.6-ds-rusxmms.patch Patch1: taglib-1.7.2-doxygen.patch +# PATCH-FIX-UPSTREAM taglib-1.8-version_fix.patch - fix version defines in taglib.h +Patch2: taglib-1.8-version_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen @@ -97,6 +99,7 @@ This package contains development files for taglib. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build mkdir build