From c0f8c8cf145c8bd664a0a08828c0cf84102e892f5723985e62644ceacbea8043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 17 Jul 2019 08:42:55 +0000
Subject: [PATCH] - Use version 1.11.2~git20190531.ba7adc2b to match up the  
 update-version.patch

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=88
---
 _service                                  |  4 ++--
 taglib-1.11.1+git20190531.ba7adc2b.tar.xz |  3 ---
 taglib-1.11.2~git20190531.ba7adc2b.tar.xz |  3 +++
 taglib.changes                            |  7 +++++++
 taglib.spec                               | 21 ++++++++++++++-------
 5 files changed, 26 insertions(+), 12 deletions(-)
 delete mode 100644 taglib-1.11.1+git20190531.ba7adc2b.tar.xz
 create mode 100644 taglib-1.11.2~git20190531.ba7adc2b.tar.xz

diff --git a/_service b/_service
index ad055ab..80f2d2c 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">1.11.1</param>
-    <param name="versionformat">1.11.1+git%cd.%h</param>
+    <param name="version">1.11.2</param>
+    <param name="versionformat">1.11.2~git%cd.%h</param>
     <param name="url">https://github.com/taglib/taglib.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
diff --git a/taglib-1.11.1+git20190531.ba7adc2b.tar.xz b/taglib-1.11.1+git20190531.ba7adc2b.tar.xz
deleted file mode 100644
index a5aa361..0000000
--- a/taglib-1.11.1+git20190531.ba7adc2b.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f5bd0a3525a50d22638d019f85130490a26a67e4ec4caf57d1774cb5192f69a
-size 902668
diff --git a/taglib-1.11.2~git20190531.ba7adc2b.tar.xz b/taglib-1.11.2~git20190531.ba7adc2b.tar.xz
new file mode 100644
index 0000000..f79487d
--- /dev/null
+++ b/taglib-1.11.2~git20190531.ba7adc2b.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:afb4fcd7564a65d5fee0be656311d6061b9ed8a85367c942bb82c900169f6fc4
+size 902932
diff --git a/taglib.changes b/taglib.changes
index e820a81..b230f4a 100644
--- a/taglib.changes
+++ b/taglib.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 17 08:21:00 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Use version 1.11.2~git20190531.ba7adc2b to match up the
+  update-version.patch
+- Install examples
+
 -------------------------------------------------------------------
 Mon Jul  8 09:06:19 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/taglib.spec b/taglib.spec
index df98353..e3c5e86 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -27,7 +27,7 @@
 %bcond_with tests
 %endif
 Name:           taglib%{psuffix}
-Version:        1.11.1+git20190531.ba7adc2b
+Version:        1.11.2~git20190531.ba7adc2b
 Release:        0
 Summary:        Audio Meta-Data Library
 License:        LGPL-2.1-or-later AND MPL-1.1
@@ -44,8 +44,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(zlib)
 # NOTE: The tagreader and writer executables give different results when built with
 # an earlier taglib-1.8-ds-rusxmms patch. See bnc#814814
-Requires:       libtag1 = %{version}-%{release}
-Requires:       libtag_c0 = %{version}-%{release}
+Requires:       libtag1 >= %{version}-%{release}
+Requires:       libtag_c0 >= %{version}-%{release}
 %if %{with tests}
 BuildRequires:  doxygen
 BuildRequires:  ghostscript-fonts-std
@@ -92,8 +92,8 @@ Summary:        Development files for taglib
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libstdc++-devel
-Requires:       libtag1 = %{version}-%{release}
-Requires:       libtag_c0 = %{version}-%{release}
+Requires:       libtag1 >= %{version}-%{release}
+Requires:       libtag_c0 >= %{version}-%{release}
 # taglib-devel was last used in openSUSE 11.4 (taglib-devel-1.6.2)
 # The last taglib-devel used was version 1.6.3 from multimedia:libs.
 Provides:       taglib-devel = %{version}
@@ -122,12 +122,12 @@ This package contains the taglib API Documentation in HTML format.
   -DWITH_MP4:BOOL=ON \
 %if %{with tests}
   -DBUILD_TESTS:BOOL=ON \
-  -DBUILD_EXAMPLES:BOOL=ON \
+  -DBUILD_EXAMPLES:BOOL=OFF \
   -DBUILD_STATIC_LIBS:BOOL=ON \
   -DBUILD_SHARED_LIBS:BOOL=OFF
 %else
   -DBUILD_TESTS:BOOL=OFF \
-  -DBUILD_EXAMPLES:BOOL=OFF
+  -DBUILD_EXAMPLES:BOOL=ON
 %endif
 %cmake_build
 
@@ -150,6 +150,8 @@ cp -a build/doc/html/ %{buildroot}%{_defaultdocdir}/libtag-doc/
 
 %else
 %cmake_install
+# install the examples
+install -m755 build/examples/{framelist,strip-id3v1,tagreader,tagreader_c,tagwriter} %{buildroot}%{_bindir}
 %endif
 %fdupes %{buildroot}
 
@@ -164,6 +166,11 @@ cp -a build/doc/html/ %{buildroot}%{_defaultdocdir}/libtag-doc/
 %post -n libtag_c0 -p /sbin/ldconfig
 %postun -n libtag_c0 -p /sbin/ldconfig
 
+%files
+%license COPYING.LGPL COPYING.MPL
+%{_bindir}/*
+%exclude %{_bindir}/taglib-config
+
 %files -n libtag1
 %license COPYING.LGPL COPYING.MPL
 %{_libdir}/libtag.so.1