Compare commits

..

No commits in common. "rawhide" and "f26" have entirely different histories.
rawhide ... f26

5 changed files with 46 additions and 168 deletions

View File

@ -1,27 +0,0 @@
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

View File

@ -1,21 +1,6 @@
From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
From: phantomjinx <p.g.richardson@phantomjinx.co.uk>
Date: Sat, 9 Aug 2014 19:57:10 +0100
Subject: [PATCH] #323 Segmentation fault when opening ipod
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Patch submitted in bug report from François Melchior / James Burton
---
src/itdb_itunesdb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 4cc771a..1e85476 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
@@ -1156,6 +1156,7 @@
GHashTable *pc_dict, *track_dict;
GValue *to_parse;
GArray *array;
@ -23,7 +8,7 @@ index 4cc771a..1e85476 100644
gint i;
guint32 mac_time;
guint64 *dbid;
@@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
@@ -1175,11 +1176,12 @@
array = (GArray*)g_value_get_boxed (to_parse);
for (i = 0; i < array->len; i++) {
@ -37,7 +22,3 @@ index 4cc771a..1e85476 100644
+ track_dict = g_value_get_boxed (&value);
if (track_dict == NULL)
continue;
--
2.26.2

View File

@ -1,15 +0,0 @@
--- tools/90-libgpod.rules.in~ 2011-07-24 06:03:29.000000000 -0500
+++ tools/90-libgpod.rules.in 2019-10-15 15:50:28.279770507 -0500
@@ -16,10 +16,10 @@
# "iPods" using the afc protocol (iPhone, iPod Touch, ...)
-ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}+="@udevdir@/iphone-set-info", GOTO="libgpod_end"
+ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}=="@udevdir@/iphone-set-info", GOTO="libgpod_end"
# with a new enough usbmuxd, the rule below is not useful since it will
# take care of setting USBMUX_SUPPORTED for all supported devices. Keep
# this rule for now until distros ship a new enough usbmuxd
-ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}+="@udevdir@/iphone-set-info"
+ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}=="@udevdir@/iphone-set-info"
LABEL="libgpod_end"

View File

@ -1,16 +0,0 @@
from Config import addFilter
# libgpod is unlikely to be updated to fix the license file
addFilter("incorrect-fsf-address .*/COPYING")
# the README.SysInfo file documents the usage of this command
addFilter("libgpod.*: W: no-manual-page-for-binary ipod-read-sysinfo-extended")
# documention is in libgpod-doc
addFilter("libgpod-(devel|sharp).*: W: no-documentation")
# only-non-binary-in-usr-lib is expected for mono packages
addFilter("libgpod-sharp.*: W: only-non-binary-in-usr-lib")
# ignore spelling errors
addFilter("libgpod.*: W: spelling-error %description .* (playlists|playcounts|podcasts)")

View File

@ -1,3 +1,8 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# python-gpod should not advertise _gpod.so in its Provides
%define __provides_exclude_from %{python_sitearch}/.*\.so$
# If banshee ever stablizes around gtk3, we need to flip this on.
%global with_gtk3 0
@ -13,8 +18,9 @@
Summary: Library to access the contents of an iPod
Name: libgpod
Version: 0.8.3
Release: 42%{?dist}
Release: 17%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtkpod.org/libgpod.html
Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.bz2
@ -23,8 +29,6 @@ Patch0: libgpod-0.8.2-pkgconfig_overlinking.patch
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
@ -45,12 +49,12 @@ BuildRequires: gtk-sharp3-devel
BuildRequires: gtk-sharp2-devel
%endif
%endif
BuildRequires: gtk-doc
BuildRequires: pygobject2-devel
BuildRequires: python-devel
BuildRequires: python-mutagen
BuildRequires: sg3_utils-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: systemd-rpm-macros
BuildRequires: make
Requires: systemd
%description
@ -60,6 +64,7 @@ smart playlists, playcounts, ratings, podcasts, album artwork, photos, etc.
%package devel
Summary: Development files for the libgpod library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -72,6 +77,7 @@ libgpod.
%package doc
Summary: API documentation for the libgpod library
Group: Documentation
License: GFDL
%if 0%{?fedora}
BuildArch: noarch
@ -85,9 +91,21 @@ smart playlists, playcounts, ratings, podcasts, album artwork, photos, etc.
This package contains the API documentation.
%package -n python-gpod
Summary: Python module to access iPod content
Group: Development/Languages
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python-mutagen
%description -n python-gpod
A python module to access iPod content. This module provides bindings to the
libgpod library.
%if %{with_mono}
%package sharp
Summary: C#/.NET library to access iPod content
Group: Development/Languages
Requires: %{name}%{?_isa} = %{version}-%{release}
%description sharp
@ -97,6 +115,7 @@ library.
%package sharp-devel
Summary: Development files for libgpod-sharp
Group: Development/Languages
Requires: %{name}-sharp%{?_isa} = %{version}-%{release}
%description sharp-devel
@ -110,12 +129,14 @@ libgpod-sharp.
%prep
%setup -q
%patch0 -p1 -b .pkgconfig_overlinking
%patch1 -p1 -b .swig
%patch2 -p1 -b .mono4
%patch3 -p1 -b .playcounts
%patch4 -p0 -b .udev
%patch5 -p1 -b .libplist-2.2
# remove execute perms on the python examples as they'll be installed in %%doc
chmod -x bindings/python/examples/*.py
%if %{with_gtk3}
sed -i "s#sharp-2.0#sharp-3.0#g" bindings/mono/libgpod-sharp/libgpod-sharp.pc.in
@ -128,7 +149,7 @@ autoreconf -vif
sed -i "s#sharp-2.0#sharp-3.0#g" configure
%endif
%configure --without-hal --enable-udev --with-temp-mount-dir=/run/%{name} --with-python=no
%configure --without-hal --enable-udev --with-temp-mount-dir=/run/%{name}
make %{?_smp_mflags} V=1
@ -138,6 +159,9 @@ make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_libdir}/libgpod
# remove Makefiles from the python examples dir
rm -rf bindings/python/examples/Makefile*
%if %{with_mono}
# remove execute perms from some libgpod-sharp files
chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config
@ -148,15 +172,18 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/%{name}-sharp.pc
# Setup tmpfiles.d config
mkdir -p %{buildroot}%{_tmpfilesdir}
echo "D /run/%{name} - - - -" > %{buildroot}%{_tmpfilesdir}/%{name}.conf
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
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
@ -181,6 +208,12 @@ find %{buildroot} -type f -name "*.a" -delete
%files doc
%{_datadir}/gtk-doc
%files -n python-gpod
%doc COPYING bindings/python/README bindings/python/examples
%{python_sitearch}/gpod
%if %{with_mono}
%files sharp
%{_libdir}/%{name}/%{name}-sharp*
@ -191,84 +224,6 @@ find %{buildroot} -type f -name "*.a" -delete
%endif
%changelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Apr 07 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.8.3-39
- rebuilt for sg3_utils 1.46
* Thu Mar 25 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.8.3-38
- Update for autoconf 2.71
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* 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
* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 0.8.3-33
- rebuilt for sg3_utils 1.45 (#1809392)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Oct 15 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.8.3-31
- Correct udev rules.
* Wed Aug 07 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.8.3-30
- Fix FTBFS.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Feb 19 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.8.3-28
- Explicity disable python to fix local builds.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Oct 03 2018 Todd Zullinger <tmz@pobox.com> - 0.8.3-26
- Fix mode of /run/libgpod in tmpfiles.d config, use /run
* Fri Sep 28 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.8.3-25
- Drop python2.
* Tue Jul 24 2018 Christophe Fergeau <cfergeau@redhat.com> - 0.8.3-24
- Fix build with python2
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.8.3-21
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.3-20
- Python 2 binary package renamed to python2-gpod
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Feb 21 2017 Tom Callaway <spot@fedoraproject.org> - 0.8.3-17
- conditionalize (and disable) gtk3 support
banshee is not ready for gtk3 yet