diff --git a/libgpod-fixswig.patch b/libgpod-fixswig.patch new file mode 100644 index 0000000..23e49c5 --- /dev/null +++ b/libgpod-fixswig.patch @@ -0,0 +1,14 @@ +--- libgpod-0.8.3/bindings/python/gpod.i.in 2015-02-12 08:43:11.058975384 +0100 ++++ libgpod-0.8.3/bindings/python/gpod.i.in.orig 2015-02-12 08:44:08.185561253 +0100 +@@ -298,9 +298,11 @@ PyObject* sw_get_photo(GList *list, gint + %include "gpod_doc.i" + %include "@top_builddir@/config.h" + ++/* + # be nicer to decode these utf8 strings into Unicode objects in the C + # layer. Here we are leaving it to the Python side, and just giving + # them utf8 encoded Strings. ++*/ + typedef char gchar; + + %typemap(in) time_t { diff --git a/libgpod-playcounts.patch b/libgpod-playcounts.patch new file mode 100644 index 0000000..b0bf4d3 --- /dev/null +++ b/libgpod-playcounts.patch @@ -0,0 +1,24 @@ +--- a/src/itdb_itunesdb.c ++++ b/src/itdb_itunesdb.c +@@ -1156,6 +1156,7 @@ + GHashTable *pc_dict, *track_dict; + GValue *to_parse; + GArray *array; ++ GValue value; + gint i; + guint32 mac_time; + guint64 *dbid; +@@ -1175,11 +1176,12 @@ + + array = (GArray*)g_value_get_boxed (to_parse); + for (i = 0; i < array->len; i++) { +- if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) { ++ value = g_array_index (array, GValue, i); ++ if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) { + continue; + } + +- track_dict = g_value_get_boxed (g_array_index (array, GValue *, i)); ++ track_dict = g_value_get_boxed (&value); + if (track_dict == NULL) + continue; diff --git a/libgpod.spec b/libgpod.spec index 7d801b9..109bc26 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -12,16 +12,17 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.8.3 -Release: 8%{?dist} +Release: 13%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.bz2 # upstreamable patch: reduce pkgconfig-related overlinking -# -Patch50: libgpod-0.8.2-pkgconfig_overlinking.patch -Patch2: libgpod-0.8.3-mono4.patch +Patch0: libgpod-0.8.2-pkgconfig_overlinking.patch +Patch1: libgpod-fixswig.patch +Patch2: libgpod-0.8.3-mono4.patch +Patch3: libgpod-playcounts.patch BuildRequires: automake libtool BuildRequires: docbook-style-xsl @@ -104,7 +105,6 @@ library. %package sharp-devel Summary: Development files for libgpod-sharp -Summary: C#/.NET library to access iPod content Group: Development/Languages Requires: %{name}-sharp%{?_isa} = %{version}-%{release} @@ -120,8 +120,10 @@ libgpod-sharp. %prep %setup -q -%patch50 -p1 -b .pkgconfig_overlinking +%patch0 -p1 -b .pkgconfig_overlinking +%patch1 -p1 -b .swig %patch2 -p1 -b .mono4 +%patch3 -p1 -b .playcounts # remove execute perms on the python examples as they'll be installed in %%doc chmod -x bindings/python/examples/*.py @@ -130,8 +132,8 @@ chmod -x bindings/python/examples/*.py %build autoreconf -vif -%configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} -make %{?_smp_mflags} +%configure --without-hal --enable-udev --with-temp-mount-dir=/run/%{name} +make %{?_smp_mflags} V=1 %install @@ -151,67 +153,79 @@ chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config rm -f %{buildroot}/%{_libdir}/pkgconfig/%{name}-sharp.pc %endif -%if 0%{?fedora} >= 15 # Setup tmpfiles.d config -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -echo "D /var/run/%{name} 0755 root root -" > \ - %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -%endif +mkdir -p %{buildroot}%{_tmpfilesdir} +echo "D /var/run/%{name} 0644 root root -" > \ + %{buildroot}%{_tmpfilesdir}/%{name}.conf + +mkdir -p %{buildroot}/run +install -d -m 0755 %{buildroot}/run/%{name}/ +# remove static libs and libtool archives +find %{buildroot} -type f -name "*.la" -delete +find %{buildroot} -type f -name "*.a" -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-, root, root, 0755) -%doc AUTHORS ChangeLog COPYING NEWS README* -%if 0%{?fedora} >= 15 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%endif +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS ChangeLog NEWS README* %{_bindir}/* %{_libdir}/*.so.* -%dir %{_localstatedir}/run/%{name} +%dir /run/%{name}/ +%{_tmpfilesdir}/%{name}.conf /lib/udev/iphone-set-info /lib/udev/ipod-set-info /lib/udev/rules.d/*.rules %dir %{_libdir}/libgpod/ %files devel -%defattr(-, root, root, 0755) %{_includedir}/gpod-1.0/ %{_libdir}/pkgconfig/%{name}-1.0.pc -%exclude %{_libdir}/*.a -%exclude %{_libdir}/*.la %{_libdir}/*.so %files doc -%defattr(-, root, root, 0755) %{_datadir}/gtk-doc %files -n python-gpod -%defattr(-, root, root, 0755) %doc COPYING bindings/python/README bindings/python/examples %{python_sitearch}/gpod -%exclude %{python_sitearch}/gpod/*.la %if %{with_mono} %files sharp -%defattr(-, root, root, 0755) %{_libdir}/%{name}/%{name}-sharp* %files sharp-devel -%defattr(-, root, root, 0755) %{_libdir}/pkgconfig/%{name}-sharp.pc %endif %changelog -* Thu Sep 08 2016 Timotheus Pokorra - 0.8.3-8 -- fix build with mono4 +* Thu Sep 22 2016 Jon Ciesla - 0.8.3-13 +- Patch for iOS crash, BZ 1359954. + +* Tue Jul 19 2016 Fedora Release Engineering - 0.8.3-12 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 0.8.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.8.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 18 2015 Peter Robinson 0.8.3-9 +- Rebuild (mono4) + +* Wed Feb 11 2015 Peter Robinson 0.8.3-8 +- Rebuild (libimobiledevice) +- Use %%license +- Fix use of temp files (rhbz#840183) * Sun Nov 16 2014 Dan Horák - 0.8.3-7 - switch to mono_arches