From 2faa241427828902e5f9896a37b713561af29ab4 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Feb 20 2009 16:13:40 +0000 Subject: Update to 0.7.0 - BR libxml2-devel --- diff --git a/.cvsignore b/.cvsignore index df64d50..6da8221 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgpod-0.6.0.tar.gz +libgpod-0.7.0.tar.gz diff --git a/libgpod-0.6.0-ipod-touch-typos.patch b/libgpod-0.6.0-ipod-touch-typos.patch deleted file mode 100644 index ac267f8..0000000 --- a/libgpod-0.6.0-ipod-touch-typos.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 1792) -+++ ChangeLog (revision 1793) -@@ -0,0 +1,4 @@ -+2007-11-16 Christophe Fergeau -+ -+ * src/itdb_device.c: fix typoes in iPod Touch model lists -+ - 2007-11-14 Christophe - - * src/itdb_itunesdb.c: get rid of local g_mkdir_with_parents copy -Index: src/itdb_device.c -=================================================================== ---- src/itdb_device.c (revision 1792) -+++ src/itdb_device.c (revision 1793) -@@ -185,7 +185,7 @@ - /* iPod touch G1 */ - /* With touch screen */ - {"A623", 8, ITDB_IPOD_MODEL_TOUCH_BLACK, ITDB_IPOD_GENERATION_TOUCH_1, 14}, -- {"A627", 16, ITDB_IPOD_MODEL_NANO_SILVER, ITDB_IPOD_GENERATION_TOUCH_1, 28}, -+ {"A627", 16, ITDB_IPOD_MODEL_TOUCH_BLACK, ITDB_IPOD_GENERATION_TOUCH_1, 28}, - - - /* No known model number -- create a Device/SysInfo file with -@@ -257,7 +257,7 @@ - N_("Video (1st Gen.)"), - N_("Video (2nd Gen.)"), - N_("Classic"), -- N_("Touch (Read-Only)"), -+ N_("Touch"), - N_("Unused"), - N_("Unused"), - NULL diff --git a/libgpod-0.6.0-photoremove.patch b/libgpod-0.6.0-photoremove.patch deleted file mode 100644 index e801621..0000000 --- a/libgpod-0.6.0-photoremove.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 1778) -+++ ChangeLog (revision 1785) -@@ -1,5 +1,21 @@ --====== libgpod 0.6.0 ====== -+2007-11-14 Christophe - -+ * src/itdb_photoalbum.c: use g_list_remove all instead of an -+ inefficient combination of g_list_find + g_list_remove -+ -+2007-11-14 Jorg Schuler -+ -+ * src/itdb_photoalbum.c (itdb_photodb_photoalbum_remove): make -+ sure same photo isn't freed multiple times if it was added in an -+ album multiple times. -+ -+2007-11-13 Christophe Fergeau -+ -+ * src/itdb_photoalbum.c: fix bug in itdb_photodb_photoalbum_remove, -+ when removing all the photos from the photodatabase, we were -+ erasing elements and iterating over the list at the same time, -+ which resulted in the function not working properly -+ - 2007-11-10 Christophe Fergeau - - * Makefile.am: add README.SysInfo to EXTRADIST -Index: src/itdb_photoalbum.c -=================================================================== ---- src/itdb_photoalbum.c (revision 1778) -+++ src/itdb_photoalbum.c (revision 1785) -@@ -1,4 +1,4 @@ --/* Time-stamp: <2007-11-03 20:27:36 jcs> -+/* - | - | Copyright (C) 2002-2006 Jorg Schuler - | Part of the gtkpod project. -@@ -615,10 +615,7 @@ - for (it = db->photoalbums; it != NULL; it = it->next) - { - Itdb_PhotoAlbum *_album = it->data; -- while (g_list_find (_album->members, photo)) -- { -- _album->members = g_list_remove (_album->members, photo); -- } -+ _album->members = g_list_remove_all (_album->members, photo); - } - /* Remove the photo from the image list */ - db->photos = g_list_remove (db->photos, photo); -@@ -678,8 +675,6 @@ - Itdb_PhotoAlbum *album, - gboolean remove_pics) - { -- GList *it; -- - g_return_if_fail (db); - g_return_if_fail (album); - -@@ -687,11 +682,16 @@ - * and remove them from the database */ - if (remove_pics) - { -- for (it = album->members; it != NULL; it = it->next ) -+ /* we can't iterate over album->members because -+ itdb_photodb_remove_photo() modifies album->members in -+ a not easily predicable way (e.g. @photo may exist in the -+ album several times). Therefore we remove photos until -+ album->members is empty. */ -+ while (album->members) - { -- Itdb_Artwork *photo = it->data; -- itdb_photodb_remove_photo (db, NULL, photo); -- } -+ Itdb_Artwork *photo = album->members->data; -+ itdb_photodb_remove_photo (db, NULL, photo); -+ } - } - db->photoalbums = g_list_remove (db->photoalbums, album); - itdb_photodb_photoalbum_free (album); diff --git a/libgpod-0.6.0-sg3_utils-1.26.patch b/libgpod-0.6.0-sg3_utils-1.26.patch deleted file mode 100644 index 10fdb95..0000000 --- a/libgpod-0.6.0-sg3_utils-1.26.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nru libgpod-0.6.0.orig/configure libgpod-0.6.0/configure ---- libgpod-0.6.0.orig/configure 2007-11-10 12:16:17.000000000 +0100 -+++ libgpod-0.6.0/configure 2008-06-30 19:18:34.000000000 +0200 -@@ -20204,13 +20204,13 @@ - eval echo $libdir - )` - --{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5 --echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5 -+echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils2... $ECHO_C" >&6; } - if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lsgutils $LIBS" -+LIBS="-lsgutils2 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20266,7 +20266,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_sgutils_sg_ll_inquiry" >&5 - echo "${ECHO_T}$ac_cv_lib_sgutils_sg_ll_inquiry" >&6; } - if test $ac_cv_lib_sgutils_sg_ll_inquiry = yes; then -- SGUTILS_LIBS="-lsgutils"; have_sgutils=yes -+ SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes - else - have_sgutils=no - fi -diff -Nru libgpod-0.6.0.orig/configure.ac libgpod-0.6.0/configure.ac ---- libgpod-0.6.0.orig/configure.ac 2007-11-06 21:03:35.000000000 +0100 -+++ libgpod-0.6.0/configure.ac 2008-06-30 19:17:50.000000000 +0200 -@@ -78,8 +78,8 @@ - dnl ************************************************** - dnl * sgutils is necessary to get the xml device file from the ipod - dnl ************************************************** --AC_CHECK_LIB(sgutils, sg_ll_inquiry, -- [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes], -+AC_CHECK_LIB(sgutils2, sg_ll_inquiry, -+ [SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes], - have_sgutils=no) - AC_SUBST(SGUTILS_LIBS) - AM_CONDITIONAL(HAVE_SGUTILS, test x"$have_sgutils" = xyes) -diff -Nru libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c libgpod-0.6.0/tools/ipod-scsi-inquiry.c ---- libgpod-0.6.0.orig/tools/ipod-scsi-inquiry.c 2007-11-10 10:40:27.000000000 +0100 -+++ libgpod-0.6.0/tools/ipod-scsi-inquiry.c 2008-06-30 19:32:36.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/libgpod-0.6.0-spl-tracklen.patch b/libgpod-0.6.0-spl-tracklen.patch deleted file mode 100644 index ffd65f7..0000000 --- a/libgpod-0.6.0-spl-tracklen.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 1796) -+++ ChangeLog (revision 1797) -@@ -1,3 +1,15 @@ -+2007-11-17 Jorg Schuler -+ -+ * src/itdb_playlist.c (itdb_splr_eval): track length in rules for -+ smart playlists was treated as seconds, but the iPod treats them -+ as milliseconds. If you told libgpod to create a smart playlist -+ with tracks less than 100 secs in length, but the life update of -+ the iPod would interpret that rule as "tracks less than 100 msec -+ in length", giving a vastly different result. Tested with iPod -+ Nano 1G and iPod nano Video (3G). -+ -+ Requires corresponding fix in GUIs using this function. -+ - 2007-11-16 Christophe Fergeau - - * src/itdb_device.c: fix typoes in iPod Touch model lists -Index: src/itdb_playlist.c -=================================================================== ---- src/itdb_playlist.c (revision 1796) -+++ src/itdb_playlist.c (revision 1797) -@@ -1,5 +1,4 @@ --/* Time-stamp: <2007-02-25 11:52:48 jcs> --| -+/* - | Copyright (C) 2002-2005 Jorg Schuler - | Part of the gtkpod project. - | -@@ -424,7 +423,7 @@ - handled = TRUE; - break; - case ITDB_SPLFIELD_TIME: -- intcomp = track->tracklen/1000; -+ intcomp = track->tracklen; - handled = TRUE; - break; - case ITDB_SPLFIELD_COMPILATION: diff --git a/libgpod.spec b/libgpod.spec index f4cbc2c..99529b8 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -2,24 +2,21 @@ Summary: Library to access the contents of an iPod Name: libgpod -Version: 0.6.0 -Release: 10%{?dist} +Version: 0.7.0 +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 -Patch0: libgpod-0.6.0-photoremove.patch -Patch1: libgpod-0.6.0-ipod-touch-typos.patch -Patch2: libgpod-0.6.0-spl-tracklen.patch -Patch3: libgpod-0.6.0-sg3_utils-1.26.patch # See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html -Patch4: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch +Patch0: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: docbook-style-xsl BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: gettext BuildRequires: hal-devel +BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: perl(XML::Parser) BuildRequires: pygobject2-devel @@ -77,11 +74,7 @@ libgpod library. %prep %setup -q -%patch0 -p0 -b .photoremove -%patch1 -p0 -b .ipod-touch-typos -%patch2 -p0 -b .spl-tracklen -%patch3 -p1 -b .sg3_utils -%patch4 -p1 -b .selinux +%patch0 -p1 -b .selinux # remove execute perms on the python examples as they'll be installed in %doc %{__chmod} -x bindings/python/examples/*.py @@ -91,9 +84,6 @@ libgpod library. %configure --with-hal-callouts-dir=%{_libdir}/hal/scripts %{__make} %{?_smp_mflags} -# add gdk-pixbuf-2.0 to the pkg-config file requirements -%{__sed} -i -e 's/^Requires:.*/& gdk-pixbuf-2.0/' libgpod-1.0.pc - %install %{__rm} -rf %{buildroot} @@ -144,6 +134,10 @@ libgpod library. %changelog +* Fri Feb 20 2009 Todd Zullinger - 0.7.0-1 +- Update to 0.7.0 +- BR libxml2-devel + * Wed Jan 14 2009 Todd Zullinger - 0.6.0-10 - Fix path to hal callout (this should help setup the SysInfoExtended file automagically) diff --git a/sources b/sources index 70e9411..663a24f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b44d8aee3f6610370b6faf61770c5f3c libgpod-0.6.0.tar.gz +34eba68a6037e6b2feda20f46d1dbfb8 libgpod-0.7.0.tar.gz