From 0d17c11c23713a10f010bd08231c9f5e0b770102 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 4 Mar 2010 14:54:31 +0000 Subject: [PATCH 01/15] - Update to 0.7.91 - Use udev callout, disable HAL callouts - Enable iPhone/iPod Touch support --- .cvsignore | 2 +- ...e-temporary-mount-point-configurable.patch | 85 +++++++++++++++++++ ...un-hald-as-mount-dir-for-hal-callout.patch | 26 ------ libgpod.spec | 34 +++++--- sources | 2 +- 5 files changed, 107 insertions(+), 42 deletions(-) create mode 100644 0001-Make-the-temporary-mount-point-configurable.patch delete mode 100644 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch diff --git a/.cvsignore b/.cvsignore index 7c39284..2df6421 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgpod-0.7.90.tar.gz +libgpod-0.7.91.tar.gz diff --git a/0001-Make-the-temporary-mount-point-configurable.patch b/0001-Make-the-temporary-mount-point-configurable.patch new file mode 100644 index 0000000..1405f9d --- /dev/null +++ b/0001-Make-the-temporary-mount-point-configurable.patch @@ -0,0 +1,85 @@ +From bd44ab460a2f0d531df0b6b34176efaf6a0641ac Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 4 Mar 2010 14:47:17 +0000 +Subject: [PATCH] Make the temporary mount point configurable + +Distributions that use SELinux cannot have libgpod's callouts +mount devices as they wish in random location on the disk. + +Instead, we'd use a specific directory, so that the SELinux +rules could be amended for that case. + +This patch does not change the default location of the temporary +directory. +--- + configure.ac | 15 +++++++++++++++ + tools/Makefile.am | 9 +++++++++ + tools/generic-callout.c | 2 +- + 3 files changed, 25 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 14d7135..1d03dcb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -203,6 +203,20 @@ AC_ARG_ENABLE(udev, + AM_CONDITIONAL(USE_UDEV, test x"$enable_udev" = xyes) + AC_SUBST([udevdir], [/lib/udev]) + ++dnl *********************************************************************** ++dnl * for the udev and hal callouts, we need a temporary directory to ++dnl * mount the iPod to write out its extended info file. ++dnl *********************************************************************** ++ ++temp_mount_dir="/tmp/" ++AC_ARG_WITH(temp_mount_dir, AC_HELP_STRING([--with-mount-dir=DIR], ++ [Directory where HAL/udev will create a sub-directory to mount iPods]),, ++ with_temp_mount_dir="$temp_mount_dir") ++TMPMOUNTDIR="$with_temp_mount_dir" ++AC_SUBST(TMPMOUNTDIR) ++AH_TEMPLATE([TMPMOUNTDIR], [Directory where HAL/udev will create a sub-directory to mount iPods]) ++AC_DEFINE_UNQUOTED(TMPMOUNTDIR, "$with_temp_mount_dir", [Directory where HAL/udev will create a sub-directory to mount iPods]) ++ + dnl ************************************************** + dnl * TagLib is only used by test-rebuild-db + dnl ************************************************** +@@ -393,6 +407,7 @@ Configuration for $PACKAGE $VERSION : + Python bindings ..........: $with_python + PyGObject support ........: $have_pygobject + iPhone/iPod Touch support.: $enable_libimobiledevice ++ Temporary mount directory.: $with_temp_mount_dir + + Now type 'make' to build $PACKAGE $VERSION, + and then 'make install' for installation. +diff --git a/tools/Makefile.am b/tools/Makefile.am +index e6334cd..2f8553e 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -90,3 +90,12 @@ ipod_time_sync_CFLAGS=$(SGUTILS_CFLAGS) $(LIBGPOD_CFLAGS) + ipod_time_sync_LDADD=$(SGUTILS_LIBS) $(LIBGPOD_LIBS) + endif + ++if USE_UDEV ++install-data-hook: ++ $(MKDIR_P) "$(DESTDIR)$(MOUNTDIR)" ++endif ++if HAVE_HAL ++install-data-hook: ++ $(MKDIR_P) "$(DESTDIR)$(MOUNTDIR)" ++endif ++ +diff --git a/tools/generic-callout.c b/tools/generic-callout.c +index b45f6da..b8b617e 100644 +--- a/tools/generic-callout.c ++++ b/tools/generic-callout.c +@@ -560,7 +560,7 @@ static char *mount_ipod (const char *dev_path, const char *fstype) + char *tmpname; + int result; + +- filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL); ++ filename = g_build_filename (TMPMOUNTDIR, "ipodXXXXXX", NULL); + if (filename == NULL) { + return NULL; + } +-- +1.6.6.1 + diff --git a/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch b/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch deleted file mode 100644 index 1d5550d..0000000 --- a/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Sun, 4 Jan 2009 21:32:14 -0500 -Subject: [PATCH] Use /var/run/hald as mount dir for hal callout - -This is preferred over /tmp by SELinux. ---- - tools/hal-callout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/hal-callout.c b/tools/hal-callout.c -index e7313fe..4d6044b 100644 ---- a/tools/hal-callout.c -+++ b/tools/hal-callout.c -@@ -52,7 +52,7 @@ static char *mount_ipod (const char *dev_path) - if (fstype == NULL) { - return NULL; - } -- filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL); -+ filename = g_build_filename ("/var/run/hald", "ipodXXXXXX", NULL); - if (filename == NULL) { - return NULL; - } --- -1.6.1 - diff --git a/libgpod.spec b/libgpod.spec index cb3caae..e5ee024 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,20 +2,19 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.90 +Version: 0.7.91 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz # See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html -Patch0: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch +Patch0: 0001-Make-the-temporary-mount-point-configurable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: gettext -BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libimobiledevice-devel >= 0.9.7 BuildRequires: libplist-devel >= 1.0 @@ -24,12 +23,13 @@ BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: perl(XML::Parser) BuildRequires: pygobject2-devel -Buildrequires: python-devel -Buildrequires: python-mutagen -Buildrequires: sg3_utils-devel -Buildrequires: sqlite-devel -Buildrequires: swig -Requires: hal +BuildRequires: python-devel +BuildRequires: python-mutagen +BuildRequires: sg3_utils-devel +BuildRequires: sqlite-devel +BuildRequires: libimobiledevice-devel +BuildRequires: swig +Requires: udev %description Libgpod is a library to access the contents of an iPod. It supports playlists, @@ -82,14 +82,14 @@ libgpod library. %prep %setup -q -%patch0 -p1 -b .selinux +%patch0 -p1 -b .mount-dir # remove execute perms on the python examples as they'll be installed in %doc %{__chmod} -x bindings/python/examples/*.py %build -%configure --with-hal-callouts-dir=%{_libexecdir}/scripts +%configure --without-hal --enable-udev --with-mount-dir=%{_localstatedir}/run/libgpod %{__make} %{?_smp_mflags} @@ -115,9 +115,10 @@ libgpod library. %doc AUTHORS ChangeLog COPYING NEWS README* %{_bindir}/* %{_libdir}/*.so.* -%{_libexecdir}/scripts/* -%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi - +/lib/udev/iphone-set-info +/lib/udev/ipod-set-info +/lib/udev/rules.d/libgpod.rules +%dir %{_localstatedir}/run/libgpod %files devel %defattr(-, root, root, 0755) @@ -142,6 +143,11 @@ libgpod library. %changelog +* Thu Mar 04 2010 Bastien Nocera 0.7.91-1 +- Update to 0.7.91 +- Use udev callout, disable HAL callouts +- Enable iPhone/iPod Touch support + * Tue Feb 09 2010 Todd Zullinger - 0.7.90-1 - Update to 0.7.90 - Adjust default hal callout path (#547049) diff --git a/sources b/sources index fb7060f..a8f3ac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b81988f262074a0712362dd10673951c libgpod-0.7.90.tar.gz +172c35369a7013bbf84917b31be758f3 libgpod-0.7.91.tar.gz From b0b65ddd95bc58c755a72f6e1e025e04da830952 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 4 Mar 2010 15:43:49 +0000 Subject: [PATCH 02/15] fix patch application --- libgpod.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libgpod.spec b/libgpod.spec index e5ee024..138598c 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -8,8 +8,6 @@ License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz -# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html -Patch0: 0001-Make-the-temporary-mount-point-configurable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel @@ -31,6 +29,10 @@ BuildRequires: libimobiledevice-devel BuildRequires: swig Requires: udev +# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html +Patch0: 0001-Make-the-temporary-mount-point-configurable.patch +BuildRequires: automake autoconf libtool intltool + %description Libgpod is a library to access the contents of an iPod. It supports playlists, smart playlists, playcounts, ratings, podcasts, album artwork, photos, etc. @@ -83,6 +85,7 @@ libgpod library. %prep %setup -q %patch0 -p1 -b .mount-dir +autoreconf -f # remove execute perms on the python examples as they'll be installed in %doc %{__chmod} -x bindings/python/examples/*.py @@ -101,6 +104,7 @@ libgpod library. # remove Makefiles from the python examples dir %{__rm} -rf bindings/python/examples/Makefile* +%{__mkdir_p} %{buildroot}/%{_localstatedir}/run/libgpod %clean %{__rm} -rf %{buildroot} @@ -115,10 +119,10 @@ libgpod library. %doc AUTHORS ChangeLog COPYING NEWS README* %{_bindir}/* %{_libdir}/*.so.* +%dir %{_localstatedir}/run/libgpod/ /lib/udev/iphone-set-info /lib/udev/ipod-set-info /lib/udev/rules.d/libgpod.rules -%dir %{_localstatedir}/run/libgpod %files devel %defattr(-, root, root, 0755) From 55692afc9c6ffb55ed73caa93cffa73df80c25af Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Mar 2010 13:21:20 +0000 Subject: [PATCH 03/15] - rebuild (libimobiledevice) --- libgpod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgpod.spec b/libgpod.spec index 138598c..4c3efa1 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -3,7 +3,7 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.7.91 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -147,6 +147,9 @@ autoreconf -f %changelog +* Mon Mar 22 2010 Rex Dieter 0.7.91-2 +- rebuild (libimobiledevice) + * Thu Mar 04 2010 Bastien Nocera 0.7.91-1 - Update to 0.7.91 - Use udev callout, disable HAL callouts From cb181fe6f40726f7654774f6d8c0e858f3b2bad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 13 Apr 2010 10:17:04 +0000 Subject: [PATCH 04/15] - rebuilt for sg3_utils 1.29 --- libgpod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgpod.spec b/libgpod.spec index 4c3efa1..fa3082d 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -3,7 +3,7 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.7.91 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -147,6 +147,9 @@ autoreconf -f %changelog +* Tue Apr 13 2010 Dan Horák - 0.7.91-3 +- rebuilt for sg3_utils 1.29 + * Mon Mar 22 2010 Rex Dieter 0.7.91-2 - rebuild (libimobiledevice) From c9c56a2d8b1e5f92804dd06907a85fe226a8f77a Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 15 Jun 2010 15:45:34 +0000 Subject: [PATCH 05/15] Update to 0.7.93 - Drop upstreamed mount-dir location patch - Fix temp mount dir configure option typo - Drop duplicate libimobiledevice-devel BR - Remove pointless %{__$command} macros --- .cvsignore | 2 +- ...e-temporary-mount-point-configurable.patch | 85 ------------------- libgpod.spec | 42 ++++----- sources | 2 +- 4 files changed, 23 insertions(+), 108 deletions(-) delete mode 100644 0001-Make-the-temporary-mount-point-configurable.patch diff --git a/.cvsignore b/.cvsignore index 2df6421..013bf65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgpod-0.7.91.tar.gz +libgpod-0.7.93.tar.gz diff --git a/0001-Make-the-temporary-mount-point-configurable.patch b/0001-Make-the-temporary-mount-point-configurable.patch deleted file mode 100644 index 1405f9d..0000000 --- a/0001-Make-the-temporary-mount-point-configurable.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bd44ab460a2f0d531df0b6b34176efaf6a0641ac Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 4 Mar 2010 14:47:17 +0000 -Subject: [PATCH] Make the temporary mount point configurable - -Distributions that use SELinux cannot have libgpod's callouts -mount devices as they wish in random location on the disk. - -Instead, we'd use a specific directory, so that the SELinux -rules could be amended for that case. - -This patch does not change the default location of the temporary -directory. ---- - configure.ac | 15 +++++++++++++++ - tools/Makefile.am | 9 +++++++++ - tools/generic-callout.c | 2 +- - 3 files changed, 25 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 14d7135..1d03dcb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -203,6 +203,20 @@ AC_ARG_ENABLE(udev, - AM_CONDITIONAL(USE_UDEV, test x"$enable_udev" = xyes) - AC_SUBST([udevdir], [/lib/udev]) - -+dnl *********************************************************************** -+dnl * for the udev and hal callouts, we need a temporary directory to -+dnl * mount the iPod to write out its extended info file. -+dnl *********************************************************************** -+ -+temp_mount_dir="/tmp/" -+AC_ARG_WITH(temp_mount_dir, AC_HELP_STRING([--with-mount-dir=DIR], -+ [Directory where HAL/udev will create a sub-directory to mount iPods]),, -+ with_temp_mount_dir="$temp_mount_dir") -+TMPMOUNTDIR="$with_temp_mount_dir" -+AC_SUBST(TMPMOUNTDIR) -+AH_TEMPLATE([TMPMOUNTDIR], [Directory where HAL/udev will create a sub-directory to mount iPods]) -+AC_DEFINE_UNQUOTED(TMPMOUNTDIR, "$with_temp_mount_dir", [Directory where HAL/udev will create a sub-directory to mount iPods]) -+ - dnl ************************************************** - dnl * TagLib is only used by test-rebuild-db - dnl ************************************************** -@@ -393,6 +407,7 @@ Configuration for $PACKAGE $VERSION : - Python bindings ..........: $with_python - PyGObject support ........: $have_pygobject - iPhone/iPod Touch support.: $enable_libimobiledevice -+ Temporary mount directory.: $with_temp_mount_dir - - Now type 'make' to build $PACKAGE $VERSION, - and then 'make install' for installation. -diff --git a/tools/Makefile.am b/tools/Makefile.am -index e6334cd..2f8553e 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -90,3 +90,12 @@ ipod_time_sync_CFLAGS=$(SGUTILS_CFLAGS) $(LIBGPOD_CFLAGS) - ipod_time_sync_LDADD=$(SGUTILS_LIBS) $(LIBGPOD_LIBS) - endif - -+if USE_UDEV -+install-data-hook: -+ $(MKDIR_P) "$(DESTDIR)$(MOUNTDIR)" -+endif -+if HAVE_HAL -+install-data-hook: -+ $(MKDIR_P) "$(DESTDIR)$(MOUNTDIR)" -+endif -+ -diff --git a/tools/generic-callout.c b/tools/generic-callout.c -index b45f6da..b8b617e 100644 ---- a/tools/generic-callout.c -+++ b/tools/generic-callout.c -@@ -560,7 +560,7 @@ static char *mount_ipod (const char *dev_path, const char *fstype) - char *tmpname; - int result; - -- filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL); -+ filename = g_build_filename (TMPMOUNTDIR, "ipodXXXXXX", NULL); - if (filename == NULL) { - return NULL; - } --- -1.6.6.1 - diff --git a/libgpod.spec b/libgpod.spec index fa3082d..4b0d3bd 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,8 +2,8 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.91 -Release: 3%{?dist} +Version: 0.7.93 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -25,14 +25,9 @@ BuildRequires: python-devel BuildRequires: python-mutagen BuildRequires: sg3_utils-devel BuildRequires: sqlite-devel -BuildRequires: libimobiledevice-devel BuildRequires: swig Requires: udev -# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html -Patch0: 0001-Make-the-temporary-mount-point-configurable.patch -BuildRequires: automake autoconf libtool intltool - %description Libgpod is a library to access the contents of an iPod. It supports playlists, smart playlists, playcounts, ratings, podcasts, album artwork, photos, etc. @@ -84,30 +79,27 @@ libgpod library. %prep %setup -q -%patch0 -p1 -b .mount-dir -autoreconf -f # remove execute perms on the python examples as they'll be installed in %doc -%{__chmod} -x bindings/python/examples/*.py +chmod -x bindings/python/examples/*.py %build -%configure --without-hal --enable-udev --with-mount-dir=%{_localstatedir}/run/libgpod -%{__make} %{?_smp_mflags} +%configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} +make %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install %find_lang %{name} # remove Makefiles from the python examples dir -%{__rm} -rf bindings/python/examples/Makefile* +rm -rf bindings/python/examples/Makefile* -%{__mkdir_p} %{buildroot}/%{_localstatedir}/run/libgpod %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -119,15 +111,16 @@ autoreconf -f %doc AUTHORS ChangeLog COPYING NEWS README* %{_bindir}/* %{_libdir}/*.so.* -%dir %{_localstatedir}/run/libgpod/ +%dir %{_localstatedir}/run/%{name} /lib/udev/iphone-set-info /lib/udev/ipod-set-info -/lib/udev/rules.d/libgpod.rules +/lib/udev/rules.d/*.rules + %files devel %defattr(-, root, root, 0755) %{_includedir}/gpod-1.0/ -%{_libdir}/pkgconfig/libgpod-1.0.pc +%{_libdir}/pkgconfig/%{name}-1.0.pc %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so @@ -135,7 +128,7 @@ autoreconf -f %files doc %defattr(-, root, root, 0755) -%{_datadir}/gtk-doc/html/libgpod +%{_datadir}/gtk-doc/html/%{name} %files -n python-gpod @@ -147,6 +140,13 @@ autoreconf -f %changelog +* Tue Jun 15 2010 Todd Zullinger - 0.7.93-1 +- Update to 0.7.93 +- Drop upstreamed mount-dir location patch +- Fix temp mount dir configure option typo +- Drop duplicate libimobiledevice-devel BR +- Remove pointless %%{__$command} macros + * Tue Apr 13 2010 Dan Horák - 0.7.91-3 - rebuilt for sg3_utils 1.29 diff --git a/sources b/sources index a8f3ac6..b03e11e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -172c35369a7013bbf84917b31be758f3 libgpod-0.7.91.tar.gz +7d8ce00d78de50cb2414260512201b46 libgpod-0.7.93.tar.gz From 35e34de15c4d7702402d0c1704fdcc52363edc86 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 02:12:04 +0000 Subject: [PATCH 06/15] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- libgpod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libgpod.spec b/libgpod.spec index 4b0d3bd..71988de 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -3,7 +3,7 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.7.93 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -140,6 +140,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 David Malcolm - 0.7.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Tue Jun 15 2010 Todd Zullinger - 0.7.93-1 - Update to 0.7.93 - Drop upstreamed mount-dir location patch From 11ac821a953aac934ccb690013495047c433d04a Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 27 Jul 2010 15:28:34 +0000 Subject: [PATCH 07/15] persuade configure to work with swig 2.0.0 --- libgpod.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libgpod.spec b/libgpod.spec index 71988de..6fecd5b 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -3,7 +3,7 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.7.93 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -26,6 +26,7 @@ BuildRequires: python-mutagen BuildRequires: sg3_utils-devel BuildRequires: sqlite-devel BuildRequires: swig +BuildRequires: autoconf Requires: udev %description @@ -83,6 +84,9 @@ libgpod library. # remove execute perms on the python examples as they'll be installed in %doc chmod -x bindings/python/examples/*.py +# Persuade swig bindings to build against swig 2.0.0: +sed -i -e "s|SWIG_MIN_VERSION=1.3.24|SWIG_MIN_VERSION=2.0.0|" configure.ac +autoreconf %build %configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} @@ -140,6 +144,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 27 2010 David Malcolm - 0.7.93-3 +- persuade configure to work with swig 2.0.0 + * Wed Jul 21 2010 David Malcolm - 0.7.93-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 2c9820912c7e58bf60b44609bbc98ac1a1126b49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:06:54 +0000 Subject: [PATCH 08/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ecaaae0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libgpod -# $Id: Makefile,v 1.2 2007/10/15 19:01:22 notting Exp $ -NAME := libgpod -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6a78616ee45e227c190e72ec4e7958af78f37b5f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 23 Aug 2010 13:10:34 -0400 Subject: [PATCH 09/15] Own %{_datadir}/gtk-doc rather than require gtk-doc (#604388) --- libgpod.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libgpod.spec b/libgpod.spec index 6fecd5b..3a4ad36 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -3,7 +3,7 @@ Summary: Library to access the contents of an iPod Name: libgpod Version: 0.7.93 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html @@ -58,7 +58,6 @@ License: GFDL BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} -Requires: gtk-doc %description doc Libgpod is a library to access the contents of an iPod. It supports playlists, @@ -132,7 +131,7 @@ rm -rf %{buildroot} %files doc %defattr(-, root, root, 0755) -%{_datadir}/gtk-doc/html/%{name} +%{_datadir}/gtk-doc %files -n python-gpod @@ -144,6 +143,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 23 2010 Todd Zullinger - 0.7.93-4 +- Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388) + * Tue Jul 27 2010 David Malcolm - 0.7.93-3 - persuade configure to work with swig 2.0.0 From 0e5f56acf444b3833af72d7ff4b32ef08e631121 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Sep 2010 11:42:54 -0400 Subject: [PATCH 10/15] Update to 0.7.94 --- .gitignore | 6 +- 0001-mono-fix-dll-name-in-dllmap.patch | 50 +++++++++++++++ ...reation-of-blank-playlist-on-80GB-ip.patch | 61 +++++++++++++++++++ libgpod.spec | 18 +++--- sources | 2 +- 5 files changed, 128 insertions(+), 9 deletions(-) create mode 100644 0001-mono-fix-dll-name-in-dllmap.patch create mode 100644 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch diff --git a/.gitignore b/.gitignore index 013bf65..9bd73d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -libgpod-0.7.93.tar.gz +*~ +*.rpm +*.tar.gz +/.build*.log +/libgpod-*/ diff --git a/0001-mono-fix-dll-name-in-dllmap.patch b/0001-mono-fix-dll-name-in-dllmap.patch new file mode 100644 index 0000000..33ff360 --- /dev/null +++ b/0001-mono-fix-dll-name-in-dllmap.patch @@ -0,0 +1,50 @@ +From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001 +From: Chow Loong Jin +Date: Sat, 4 Sep 2010 16:51:35 +0200 +Subject: [PATCH 1/2] [mono] fix dll name in dllmap + +Correct the name of the dllmap from "libgpod" to "gpod", and remove +quotes from .so name +--- + bindings/mono/libgpod-sharp/Makefile.am | 2 +- + .../mono/libgpod-sharp/libgpod-sharp.dll.config.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am +index 5663163..b3cd8c4 100644 +--- a/bindings/mono/libgpod-sharp/Makefile.am ++++ b/bindings/mono/libgpod-sharp/Makefile.am +@@ -18,7 +18,7 @@ SOURCES = \ + Thumbnail.cs \ + Track.cs + +-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") ++dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") + libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in + sed "s/@DLNAME@/$(dlname)/g" $< >$@ + +diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in +index 01ad69a..cfa13ad 100644 +--- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in ++++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in +@@ -1,4 +1,4 @@ + +- ++ + + +-- +1.7.2.2 + +diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in +--- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig 2010-08-31 17:10:47.000000000 -0400 ++++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in 2010-09-05 18:45:02.540553999 -0400 +@@ -301,7 +301,7 @@ SOURCES = \ + Thumbnail.cs \ + Track.cs + +-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") ++dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libgpod-sharp.pc + EXTRAS = \ diff --git a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch new file mode 100644 index 0000000..fec21c4 --- /dev/null +++ b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch @@ -0,0 +1,61 @@ +From ed82695ebbc47de9f66e3cf7e78a71b16b32d58e Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Sat, 4 Sep 2010 17:59:37 +0200 +Subject: [PATCH 2/2] Revert "Fix for creation of blank playlist on 80GB ipod video" + +This reverts commit 1252bc0e18c396b2cb5e1bd5369f17403ca181aa. + +On an iPod Video with 1.2.1 firmware: +- With 1252bc0, no songs, no videos, no playlists at +all (except the On-the-go playlist) +- Before 1252bc0, songs/videos/playlists are visible, but +there is an additional unnamed blank music playlist. + +With latest firmware, none of these issues show up. The blank playlist +bug is better than the empty ipod bug, so let's revert to the earlier +behaviour and if someone encounters the blank playlist issue, we just +have to remember to tell him to update his firmware. For the record, +it seems only writing 4 mhsds on an iPod Video with firmware 1.2.1 +avoids these 2 issues too. +--- + src/itdb_itunesdb.c | 17 ++++++++--------- + 1 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c +index e473fb2..5041676 100644 +--- a/src/itdb_itunesdb.c ++++ b/src/itdb_itunesdb.c +@@ -5761,15 +5761,6 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, + goto err; + } + +- /* write albums (mhsd type 4) */ +- if (!write_mhsd_albums (fexp)) { +- g_set_error (&fexp->error, +- ITDB_FILE_ERROR, +- ITDB_FILE_ERROR_ITDB_CORRUPT, +- _("Error writing list of albums (mhsd type 4)")); +- goto err; +- } +- + /* write special podcast version mhsd (mhsd type 3) */ + if (!fexp->error && !write_mhsd_playlists (fexp, 3)) { + g_set_error (&fexp->error, +@@ -5787,6 +5778,14 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, + goto err; + } + ++ /* write albums (mhsd type 4) */ ++ if (!write_mhsd_albums (fexp)) { ++ g_set_error (&fexp->error, ++ ITDB_FILE_ERROR, ++ ITDB_FILE_ERROR_ITDB_CORRUPT, ++ _("Error writing list of albums (mhsd type 4)")); ++ goto err; ++ } + /* write artists (mhsd type 8) */ + if (!fexp->error && !write_mhsd_artists (fexp)) { + g_set_error (&fexp->error, +-- +1.7.2.2 + diff --git a/libgpod.spec b/libgpod.spec index 3a4ad36..53ebea1 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,12 +2,15 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.93 -Release: 4%{?dist} +Version: 0.7.94 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz +# Upstream patches +Patch0: 0001-mono-fix-dll-name-in-dllmap.patch +Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel @@ -79,13 +82,12 @@ libgpod library. %prep %setup -q +%patch0 -p1 +%patch1 -p1 -# remove execute perms on the python examples as they'll be installed in %doc +# remove execute perms on the python examples as they'll be installed in %%doc chmod -x bindings/python/examples/*.py -# Persuade swig bindings to build against swig 2.0.0: -sed -i -e "s|SWIG_MIN_VERSION=1.3.24|SWIG_MIN_VERSION=2.0.0|" configure.ac -autoreconf %build %configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} @@ -138,11 +140,13 @@ rm -rf %{buildroot} %defattr(-, root, root, 0755) %doc COPYING bindings/python/README bindings/python/examples %{python_sitearch}/gpod -%exclude %{python_sitearch}/gpod/*.a %exclude %{python_sitearch}/gpod/*.la %changelog +* Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 +- Update to 0.7.94 + * Mon Aug 23 2010 Todd Zullinger - 0.7.93-4 - Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388) diff --git a/sources b/sources index b03e11e..cceacda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d8ce00d78de50cb2414260512201b46 libgpod-0.7.93.tar.gz +cc9802ca6356b3ac5e152afb90a121d6 libgpod-0.7.94.tar.gz From e0a72799314abe4dbad55958594c5829c5e1c756 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Sep 2010 11:43:25 -0400 Subject: [PATCH 11/15] Add mono subpackage (#630181) --- libgpod.spec | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/libgpod.spec b/libgpod.spec index 53ebea1..402369b 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -14,6 +14,7 @@ Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel +BuildRequires: gtk-sharp2-devel BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: intltool @@ -22,6 +23,7 @@ BuildRequires: libplist-devel >= 1.0 BuildRequires: libusb1-devel BuildRequires: libxml2-devel BuildRequires: libxslt +BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: pygobject2-devel BuildRequires: python-devel @@ -80,6 +82,31 @@ A python module to access iPod content. This module provides bindings to the libgpod library. +%package sharp +Summary: C#/.NET library to access iPod content +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description sharp +C#/.NET library to access iPod content. Provides bindings to the libgpod +library. + + +%package sharp-devel +Summary: Development files for libgpod-sharp +Summary: C#/.NET library to access iPod content +Group: Development/Languages +Requires: %{name}-sharp = %{version}-%{release} +Requires: pkgconfig + +%description sharp-devel +C#/.NET library to access iPod content. Provides bindings to the libgpod +library. + +This package contains the files required to develop programs that will use +libgpod-sharp. + + %prep %setup -q %patch0 -p1 @@ -102,6 +129,9 @@ make DESTDIR=%{buildroot} install # remove Makefiles from the python examples dir rm -rf bindings/python/examples/Makefile* +# remove execute perms from some libgpod-sharp files +chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config + %clean rm -rf %{buildroot} @@ -143,9 +173,20 @@ rm -rf %{buildroot} %exclude %{python_sitearch}/gpod/*.la +%files sharp +%defattr(-, root, root, 0755) +%{_libdir}/%{name}/%{name}-sharp* + + +%files sharp-devel +%defattr(-, root, root, 0755) +%{_libdir}/pkgconfig/%{name}-sharp.pc + + %changelog * Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 - Update to 0.7.94 +- Add mono subpackage (#630181) * Mon Aug 23 2010 Todd Zullinger - 0.7.93-4 - Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388) From ad7ead062d73a84da6ea03a0067f33831201d343 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Sep 2010 11:42:54 -0400 Subject: [PATCH 12/15] Update to 0.7.94 --- .gitignore | 6 +- 0001-mono-fix-dll-name-in-dllmap.patch | 50 +++++++++++++++ ...reation-of-blank-playlist-on-80GB-ip.patch | 61 +++++++++++++++++++ libgpod.spec | 19 +++--- sources | 2 +- 5 files changed, 129 insertions(+), 9 deletions(-) create mode 100644 0001-mono-fix-dll-name-in-dllmap.patch create mode 100644 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch diff --git a/.gitignore b/.gitignore index 013bf65..9bd73d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -libgpod-0.7.93.tar.gz +*~ +*.rpm +*.tar.gz +/.build*.log +/libgpod-*/ diff --git a/0001-mono-fix-dll-name-in-dllmap.patch b/0001-mono-fix-dll-name-in-dllmap.patch new file mode 100644 index 0000000..33ff360 --- /dev/null +++ b/0001-mono-fix-dll-name-in-dllmap.patch @@ -0,0 +1,50 @@ +From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001 +From: Chow Loong Jin +Date: Sat, 4 Sep 2010 16:51:35 +0200 +Subject: [PATCH 1/2] [mono] fix dll name in dllmap + +Correct the name of the dllmap from "libgpod" to "gpod", and remove +quotes from .so name +--- + bindings/mono/libgpod-sharp/Makefile.am | 2 +- + .../mono/libgpod-sharp/libgpod-sharp.dll.config.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am +index 5663163..b3cd8c4 100644 +--- a/bindings/mono/libgpod-sharp/Makefile.am ++++ b/bindings/mono/libgpod-sharp/Makefile.am +@@ -18,7 +18,7 @@ SOURCES = \ + Thumbnail.cs \ + Track.cs + +-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") ++dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") + libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in + sed "s/@DLNAME@/$(dlname)/g" $< >$@ + +diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in +index 01ad69a..cfa13ad 100644 +--- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in ++++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in +@@ -1,4 +1,4 @@ + +- ++ + + +-- +1.7.2.2 + +diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in +--- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig 2010-08-31 17:10:47.000000000 -0400 ++++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in 2010-09-05 18:45:02.540553999 -0400 +@@ -301,7 +301,7 @@ SOURCES = \ + Thumbnail.cs \ + Track.cs + +-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") ++dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libgpod-sharp.pc + EXTRAS = \ diff --git a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch new file mode 100644 index 0000000..fec21c4 --- /dev/null +++ b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch @@ -0,0 +1,61 @@ +From ed82695ebbc47de9f66e3cf7e78a71b16b32d58e Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Sat, 4 Sep 2010 17:59:37 +0200 +Subject: [PATCH 2/2] Revert "Fix for creation of blank playlist on 80GB ipod video" + +This reverts commit 1252bc0e18c396b2cb5e1bd5369f17403ca181aa. + +On an iPod Video with 1.2.1 firmware: +- With 1252bc0, no songs, no videos, no playlists at +all (except the On-the-go playlist) +- Before 1252bc0, songs/videos/playlists are visible, but +there is an additional unnamed blank music playlist. + +With latest firmware, none of these issues show up. The blank playlist +bug is better than the empty ipod bug, so let's revert to the earlier +behaviour and if someone encounters the blank playlist issue, we just +have to remember to tell him to update his firmware. For the record, +it seems only writing 4 mhsds on an iPod Video with firmware 1.2.1 +avoids these 2 issues too. +--- + src/itdb_itunesdb.c | 17 ++++++++--------- + 1 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c +index e473fb2..5041676 100644 +--- a/src/itdb_itunesdb.c ++++ b/src/itdb_itunesdb.c +@@ -5761,15 +5761,6 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, + goto err; + } + +- /* write albums (mhsd type 4) */ +- if (!write_mhsd_albums (fexp)) { +- g_set_error (&fexp->error, +- ITDB_FILE_ERROR, +- ITDB_FILE_ERROR_ITDB_CORRUPT, +- _("Error writing list of albums (mhsd type 4)")); +- goto err; +- } +- + /* write special podcast version mhsd (mhsd type 3) */ + if (!fexp->error && !write_mhsd_playlists (fexp, 3)) { + g_set_error (&fexp->error, +@@ -5787,6 +5778,14 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, + goto err; + } + ++ /* write albums (mhsd type 4) */ ++ if (!write_mhsd_albums (fexp)) { ++ g_set_error (&fexp->error, ++ ITDB_FILE_ERROR, ++ ITDB_FILE_ERROR_ITDB_CORRUPT, ++ _("Error writing list of albums (mhsd type 4)")); ++ goto err; ++ } + /* write artists (mhsd type 8) */ + if (!fexp->error && !write_mhsd_artists (fexp)) { + g_set_error (&fexp->error, +-- +1.7.2.2 + diff --git a/libgpod.spec b/libgpod.spec index 3a4ad36..0996574 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,12 +2,16 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.93 -Release: 4%{?dist} +Version: 0.7.94 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz +# http://gtkpod.git.sourceforge.net/git/gitweb.cgi?p=gtkpod/libgpod;a=commitdiff;h=d82d8c8 +Patch0: 0001-mono-fix-dll-name-in-dllmap.patch +# http://gtkpod.git.sourceforge.net/git/gitweb.cgi?p=gtkpod/libgpod;a=commitdiff;h=ed82695 +Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel @@ -79,13 +83,12 @@ libgpod library. %prep %setup -q +%patch0 -p1 +%patch1 -p1 -# remove execute perms on the python examples as they'll be installed in %doc +# remove execute perms on the python examples as they'll be installed in %%doc chmod -x bindings/python/examples/*.py -# Persuade swig bindings to build against swig 2.0.0: -sed -i -e "s|SWIG_MIN_VERSION=1.3.24|SWIG_MIN_VERSION=2.0.0|" configure.ac -autoreconf %build %configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} @@ -138,11 +141,13 @@ rm -rf %{buildroot} %defattr(-, root, root, 0755) %doc COPYING bindings/python/README bindings/python/examples %{python_sitearch}/gpod -%exclude %{python_sitearch}/gpod/*.a %exclude %{python_sitearch}/gpod/*.la %changelog +* Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 +- Update to 0.7.94 + * Mon Aug 23 2010 Todd Zullinger - 0.7.93-4 - Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388) diff --git a/sources b/sources index b03e11e..cceacda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d8ce00d78de50cb2414260512201b46 libgpod-0.7.93.tar.gz +cc9802ca6356b3ac5e152afb90a121d6 libgpod-0.7.94.tar.gz From ef274f3d167df5caad0789f8762efe22158a58b2 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Sep 2010 11:43:25 -0400 Subject: [PATCH 13/15] Add mono subpackage (#630181) --- libgpod.spec | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/libgpod.spec b/libgpod.spec index 0996574..61687f2 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -15,6 +15,7 @@ Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel +BuildRequires: gtk-sharp2-devel BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: intltool @@ -23,6 +24,7 @@ BuildRequires: libplist-devel >= 1.0 BuildRequires: libusb1-devel BuildRequires: libxml2-devel BuildRequires: libxslt +BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: pygobject2-devel BuildRequires: python-devel @@ -81,6 +83,31 @@ A python module to access iPod content. This module provides bindings to the libgpod library. +%package sharp +Summary: C#/.NET library to access iPod content +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description sharp +C#/.NET library to access iPod content. Provides bindings to the libgpod +library. + + +%package sharp-devel +Summary: Development files for libgpod-sharp +Summary: C#/.NET library to access iPod content +Group: Development/Languages +Requires: %{name}-sharp = %{version}-%{release} +Requires: pkgconfig + +%description sharp-devel +C#/.NET library to access iPod content. Provides bindings to the libgpod +library. + +This package contains the files required to develop programs that will use +libgpod-sharp. + + %prep %setup -q %patch0 -p1 @@ -103,6 +130,9 @@ make DESTDIR=%{buildroot} install # remove Makefiles from the python examples dir rm -rf bindings/python/examples/Makefile* +# remove execute perms from some libgpod-sharp files +chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config + %clean rm -rf %{buildroot} @@ -144,9 +174,20 @@ rm -rf %{buildroot} %exclude %{python_sitearch}/gpod/*.la +%files sharp +%defattr(-, root, root, 0755) +%{_libdir}/%{name}/%{name}-sharp* + + +%files sharp-devel +%defattr(-, root, root, 0755) +%{_libdir}/pkgconfig/%{name}-sharp.pc + + %changelog * Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 - Update to 0.7.94 +- Add mono subpackage (#630181) * Mon Aug 23 2010 Todd Zullinger - 0.7.93-4 - Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388) From efb6c39d1c21f856e9a4ec86e4c49c8d7016fbc4 Mon Sep 17 00:00:00 2001 From: Nathaniel McCallum Date: Thu, 30 Sep 2010 10:07:51 -0400 Subject: [PATCH 14/15] Update libgpod to 0.7.95 --- .gitignore | 1 + 0001-mono-fix-dll-name-in-dllmap.patch | 50 --------------- ...reation-of-blank-playlist-on-80GB-ip.patch | 61 ------------------- libgpod.spec | 13 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 120 deletions(-) delete mode 100644 0001-mono-fix-dll-name-in-dllmap.patch delete mode 100644 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch diff --git a/.gitignore b/.gitignore index 9bd73d5..c867821 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.gz /.build*.log /libgpod-*/ +/libgpod-0.7.95.tar.gz diff --git a/0001-mono-fix-dll-name-in-dllmap.patch b/0001-mono-fix-dll-name-in-dllmap.patch deleted file mode 100644 index 33ff360..0000000 --- a/0001-mono-fix-dll-name-in-dllmap.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001 -From: Chow Loong Jin -Date: Sat, 4 Sep 2010 16:51:35 +0200 -Subject: [PATCH 1/2] [mono] fix dll name in dllmap - -Correct the name of the dllmap from "libgpod" to "gpod", and remove -quotes from .so name ---- - bindings/mono/libgpod-sharp/Makefile.am | 2 +- - .../mono/libgpod-sharp/libgpod-sharp.dll.config.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am -index 5663163..b3cd8c4 100644 ---- a/bindings/mono/libgpod-sharp/Makefile.am -+++ b/bindings/mono/libgpod-sharp/Makefile.am -@@ -18,7 +18,7 @@ SOURCES = \ - Thumbnail.cs \ - Track.cs - --dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") -+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") - libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in - sed "s/@DLNAME@/$(dlname)/g" $< >$@ - -diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -index 01ad69a..cfa13ad 100644 ---- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -+++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -@@ -1,4 +1,4 @@ - -- -+ - - --- -1.7.2.2 - -diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in ---- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig 2010-08-31 17:10:47.000000000 -0400 -+++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in 2010-09-05 18:45:02.540553999 -0400 -@@ -301,7 +301,7 @@ SOURCES = \ - Thumbnail.cs \ - Track.cs - --dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") -+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libgpod-sharp.pc - EXTRAS = \ diff --git a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch deleted file mode 100644 index fec21c4..0000000 --- a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ed82695ebbc47de9f66e3cf7e78a71b16b32d58e Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Sat, 4 Sep 2010 17:59:37 +0200 -Subject: [PATCH 2/2] Revert "Fix for creation of blank playlist on 80GB ipod video" - -This reverts commit 1252bc0e18c396b2cb5e1bd5369f17403ca181aa. - -On an iPod Video with 1.2.1 firmware: -- With 1252bc0, no songs, no videos, no playlists at -all (except the On-the-go playlist) -- Before 1252bc0, songs/videos/playlists are visible, but -there is an additional unnamed blank music playlist. - -With latest firmware, none of these issues show up. The blank playlist -bug is better than the empty ipod bug, so let's revert to the earlier -behaviour and if someone encounters the blank playlist issue, we just -have to remember to tell him to update his firmware. For the record, -it seems only writing 4 mhsds on an iPod Video with firmware 1.2.1 -avoids these 2 issues too. ---- - src/itdb_itunesdb.c | 17 ++++++++--------- - 1 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c -index e473fb2..5041676 100644 ---- a/src/itdb_itunesdb.c -+++ b/src/itdb_itunesdb.c -@@ -5761,15 +5761,6 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, - goto err; - } - -- /* write albums (mhsd type 4) */ -- if (!write_mhsd_albums (fexp)) { -- g_set_error (&fexp->error, -- ITDB_FILE_ERROR, -- ITDB_FILE_ERROR_ITDB_CORRUPT, -- _("Error writing list of albums (mhsd type 4)")); -- goto err; -- } -- - /* write special podcast version mhsd (mhsd type 3) */ - if (!fexp->error && !write_mhsd_playlists (fexp, 3)) { - g_set_error (&fexp->error, -@@ -5787,6 +5778,14 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, - goto err; - } - -+ /* write albums (mhsd type 4) */ -+ if (!write_mhsd_albums (fexp)) { -+ g_set_error (&fexp->error, -+ ITDB_FILE_ERROR, -+ ITDB_FILE_ERROR_ITDB_CORRUPT, -+ _("Error writing list of albums (mhsd type 4)")); -+ goto err; -+ } - /* write artists (mhsd type 8) */ - if (!fexp->error && !write_mhsd_artists (fexp)) { - g_set_error (&fexp->error, --- -1.7.2.2 - diff --git a/libgpod.spec b/libgpod.spec index 61687f2..b26b4d7 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,16 +2,12 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.94 +Version: 0.7.95 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz -# http://gtkpod.git.sourceforge.net/git/gitweb.cgi?p=gtkpod/libgpod;a=commitdiff;h=d82d8c8 -Patch0: 0001-mono-fix-dll-name-in-dllmap.patch -# http://gtkpod.git.sourceforge.net/git/gitweb.cgi?p=gtkpod/libgpod;a=commitdiff;h=ed82695 -Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel @@ -110,8 +106,6 @@ libgpod-sharp. %prep %setup -q -%patch0 -p1 -%patch1 -p1 # remove execute perms on the python examples as they'll be installed in %%doc chmod -x bindings/python/examples/*.py @@ -183,8 +177,11 @@ rm -rf %{buildroot} %defattr(-, root, root, 0755) %{_libdir}/pkgconfig/%{name}-sharp.pc - %changelog +* Wed Sep 29 2010 Nathaniel McCallum - 0.7.95-1 +- Update to 0.7.95 +- Drop upstreamed patches + * Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 - Update to 0.7.94 - Add mono subpackage (#630181) diff --git a/sources b/sources index cceacda..c127867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc9802ca6356b3ac5e152afb90a121d6 libgpod-0.7.94.tar.gz +8a761f678677a425436107cbd87aecf3 libgpod-0.7.95.tar.gz From f6df7f8e7e8ce3eb1531371c820b16928a629771 Mon Sep 17 00:00:00 2001 From: Nathaniel McCallum Date: Thu, 30 Sep 2010 10:27:38 -0400 Subject: [PATCH 15/15] Update libgpod to 0.7.95 --- .gitignore | 1 + 0001-mono-fix-dll-name-in-dllmap.patch | 50 --------------- ...reation-of-blank-playlist-on-80GB-ip.patch | 61 ------------------- libgpod.spec | 12 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 119 deletions(-) delete mode 100644 0001-mono-fix-dll-name-in-dllmap.patch delete mode 100644 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch diff --git a/.gitignore b/.gitignore index 9bd73d5..c867821 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.gz /.build*.log /libgpod-*/ +/libgpod-0.7.95.tar.gz diff --git a/0001-mono-fix-dll-name-in-dllmap.patch b/0001-mono-fix-dll-name-in-dllmap.patch deleted file mode 100644 index 33ff360..0000000 --- a/0001-mono-fix-dll-name-in-dllmap.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001 -From: Chow Loong Jin -Date: Sat, 4 Sep 2010 16:51:35 +0200 -Subject: [PATCH 1/2] [mono] fix dll name in dllmap - -Correct the name of the dllmap from "libgpod" to "gpod", and remove -quotes from .so name ---- - bindings/mono/libgpod-sharp/Makefile.am | 2 +- - .../mono/libgpod-sharp/libgpod-sharp.dll.config.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am -index 5663163..b3cd8c4 100644 ---- a/bindings/mono/libgpod-sharp/Makefile.am -+++ b/bindings/mono/libgpod-sharp/Makefile.am -@@ -18,7 +18,7 @@ SOURCES = \ - Thumbnail.cs \ - Track.cs - --dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") -+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") - libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in - sed "s/@DLNAME@/$(dlname)/g" $< >$@ - -diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -index 01ad69a..cfa13ad 100644 ---- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -+++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in -@@ -1,4 +1,4 @@ - -- -+ - - --- -1.7.2.2 - -diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in ---- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig 2010-08-31 17:10:47.000000000 -0400 -+++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in 2010-09-05 18:45:02.540553999 -0400 -@@ -301,7 +301,7 @@ SOURCES = \ - Thumbnail.cs \ - Track.cs - --dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g") -+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g") - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libgpod-sharp.pc - EXTRAS = \ diff --git a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch b/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch deleted file mode 100644 index fec21c4..0000000 --- a/0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ed82695ebbc47de9f66e3cf7e78a71b16b32d58e Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Sat, 4 Sep 2010 17:59:37 +0200 -Subject: [PATCH 2/2] Revert "Fix for creation of blank playlist on 80GB ipod video" - -This reverts commit 1252bc0e18c396b2cb5e1bd5369f17403ca181aa. - -On an iPod Video with 1.2.1 firmware: -- With 1252bc0, no songs, no videos, no playlists at -all (except the On-the-go playlist) -- Before 1252bc0, songs/videos/playlists are visible, but -there is an additional unnamed blank music playlist. - -With latest firmware, none of these issues show up. The blank playlist -bug is better than the empty ipod bug, so let's revert to the earlier -behaviour and if someone encounters the blank playlist issue, we just -have to remember to tell him to update his firmware. For the record, -it seems only writing 4 mhsds on an iPod Video with firmware 1.2.1 -avoids these 2 issues too. ---- - src/itdb_itunesdb.c | 17 ++++++++--------- - 1 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c -index e473fb2..5041676 100644 ---- a/src/itdb_itunesdb.c -+++ b/src/itdb_itunesdb.c -@@ -5761,15 +5761,6 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, - goto err; - } - -- /* write albums (mhsd type 4) */ -- if (!write_mhsd_albums (fexp)) { -- g_set_error (&fexp->error, -- ITDB_FILE_ERROR, -- ITDB_FILE_ERROR_ITDB_CORRUPT, -- _("Error writing list of albums (mhsd type 4)")); -- goto err; -- } -- - /* write special podcast version mhsd (mhsd type 3) */ - if (!fexp->error && !write_mhsd_playlists (fexp, 3)) { - g_set_error (&fexp->error, -@@ -5787,6 +5778,14 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB *itdb, - goto err; - } - -+ /* write albums (mhsd type 4) */ -+ if (!write_mhsd_albums (fexp)) { -+ g_set_error (&fexp->error, -+ ITDB_FILE_ERROR, -+ ITDB_FILE_ERROR_ITDB_CORRUPT, -+ _("Error writing list of albums (mhsd type 4)")); -+ goto err; -+ } - /* write artists (mhsd type 8) */ - if (!fexp->error && !write_mhsd_artists (fexp)) { - g_set_error (&fexp->error, --- -1.7.2.2 - diff --git a/libgpod.spec b/libgpod.spec index 402369b..b26b4d7 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,15 +2,12 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.7.94 +Version: 0.7.95 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtkpod.org/libgpod.html Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz -# Upstream patches -Patch0: 0001-mono-fix-dll-name-in-dllmap.patch -Patch1: 0002-Revert-Fix-for-creation-of-blank-playlist-on-80GB-ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel @@ -109,8 +106,6 @@ libgpod-sharp. %prep %setup -q -%patch0 -p1 -%patch1 -p1 # remove execute perms on the python examples as they'll be installed in %%doc chmod -x bindings/python/examples/*.py @@ -182,8 +177,11 @@ rm -rf %{buildroot} %defattr(-, root, root, 0755) %{_libdir}/pkgconfig/%{name}-sharp.pc - %changelog +* Wed Sep 29 2010 Nathaniel McCallum - 0.7.95-1 +- Update to 0.7.95 +- Drop upstreamed patches + * Sat Sep 04 2010 Todd Zullinger - 0.7.94-1 - Update to 0.7.94 - Add mono subpackage (#630181) diff --git a/sources b/sources index cceacda..c127867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc9802ca6356b3ac5e152afb90a121d6 libgpod-0.7.94.tar.gz +8a761f678677a425436107cbd87aecf3 libgpod-0.7.95.tar.gz