+ libgpod-0.8.3-35

Rebuild with the upstream libplist patch

0001-configure.ac-Add-support-for-libplist-2.2.patch

@@ -0,0 +1,27 @@
+From 46d147703337b5ab9e81266869e41c89e6481e08 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 17 Jun 2020 11:52:43 +0200
+Subject: [PATCH] configure.ac: Add support for libplist 2.2
+
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4ffeaf..c3a7a9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,9 @@ AC_CHECK_FUNCS([localtime_r])
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+ dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed 
+ dnl by libgpod sqlite code
+-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0)
++LIBPLIST_DEP=libplist
++PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0)
++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 $LIBPLIST_DEP >= 1.0 gmodule-2.0)
+ 
+ dnl ***************************************************
+ dnl The following functions are only available starting
+-- 
+2.26.2
+

libgpod.spec

@@ -13,7 +13,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.8.3
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: LGPLv2+
 URL: http://www.gtkpod.org/libgpod.html
 Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.bz2
@@ -24,6 +24,7 @@ Patch1:  libgpod-fixswig.patch
 Patch2:  libgpod-0.8.3-mono4.patch
 Patch3:  libgpod-playcounts.patch
 Patch4:  libgpod-udev.patch
+Patch5:  0001-configure.ac-Add-support-for-libplist-2.2.patch
 
 BuildRequires: automake libtool
 BuildRequires: docbook-style-xsl
@@ -112,14 +113,13 @@ libgpod-sharp.
 %patch2 -p1 -b .mono4
 %patch3 -p1 -b .playcounts
 %patch4 -p0 -b .udev
+%patch5 -p1 -b .libplist-2.2
 
 %if %{with_gtk3}
 sed -i "s#sharp-2.0#sharp-3.0#g" bindings/mono/libgpod-sharp/libgpod-sharp.pc.in
 sed -i "s#public DateTime#public System.DateTime#g" bindings/mono/libgpod-sharp/Artwork.cs
 %endif
 
-sed -i 's|libplist|libplist-2.0|' configure.ac
-
 %build
 autoreconf -vif
 %if %{with_gtk3}
@@ -189,6 +189,10 @@ find %{buildroot} -type f -name "*.a" -delete
 %endif
 
 %changelog
+* Wed Jun 17 2020 Bastien Nocera <bnocera@redhat.com> - 0.8.3-35
++ libgpod-0.8.3-35
+- Rebuild with the upstream libplist patch
+
 * Tue Jun 16 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.8.3-34
 - rebuilt for libimobiledevice and libplist