rpms/libipoddevice/devel libipoddevice-0.5.3-sg3_utils-1.26.patch, NONE, 1.1 libipoddevice.spec, 1.16, 1.17

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/libipoddevice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26035

Modified Files:
	libipoddevice.spec 
Added Files:
	libipoddevice-0.5.3-sg3_utils-1.26.patch 
Log Message:
* Mon Jun 30 2008 Dan Horak <dan[at]danny.cz> - 0.5.3-5
- add patch for sg3_utils 1.26 and rebuild


libipoddevice-0.5.3-sg3_utils-1.26.patch:

--- NEW FILE libipoddevice-0.5.3-sg3_utils-1.26.patch ---
diff -Nru libipoddevice-0.5.3.orig/configure libipoddevice-0.5.3/configure
--- libipoddevice-0.5.3.orig/configure	2007-04-01 06:57:33.000000000 +0200
+++ libipoddevice-0.5.3/configure	2008-06-30 18:51:33.000000000 +0200
@@ -20863,13 +20863,13 @@
 
 fi
 
-{ 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
@@ -20941,10 +20941,10 @@
 { 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
-  HAL_IPOD_INFO_LIBS="-lsgutils"
+  HAL_IPOD_INFO_LIBS="-lsgutils2"
 else
-  { { echo "$as_me:$LINENO: error: Error! You need to have libsgutils." >&5
-echo "$as_me: error: Error! You need to have libsgutils." >&2;}
+  { { echo "$as_me:$LINENO: error: Error! You need to have libsgutils2." >&5
+echo "$as_me: error: Error! You need to have libsgutils2." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
diff -Nru libipoddevice-0.5.3.orig/configure.ac libipoddevice-0.5.3/configure.ac
--- libipoddevice-0.5.3.orig/configure.ac	2007-04-01 06:48:20.000000000 +0200
+++ libipoddevice-0.5.3/configure.ac	2008-06-30 18:50:51.000000000 +0200
@@ -48,8 +48,8 @@
 	AC_DEFINE([HAVE_HAL_EJECT], [1], [Have a HAL that supports DBus Methods])
 fi
 
-AC_CHECK_LIB(sgutils, sg_ll_inquiry, HAL_IPOD_INFO_LIBS="-lsgutils",
-	AC_MSG_ERROR([Error! You need to have libsgutils.])
+AC_CHECK_LIB(sgutils2, sg_ll_inquiry, HAL_IPOD_INFO_LIBS="-lsgutils2",
+	AC_MSG_ERROR([Error! You need to have libsgutils2.])
 )
 
 AC_SUBST(HAL_IPOD_INFO_LIBS)
diff -Nru libipoddevice-0.5.3.orig/src/hal-ipod-info.c libipoddevice-0.5.3/src/hal-ipod-info.c
--- libipoddevice-0.5.3.orig/src/hal-ipod-info.c	2007-03-26 19:24:12.000000000 +0200
+++ libipoddevice-0.5.3/src/hal-ipod-info.c	2008-06-30 19:03:55.000000000 +0200
@@ -1,6 +1,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>


Index: libipoddevice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libipoddevice/devel/libipoddevice.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libipoddevice.spec	5 Jun 2008 00:39:09 -0000	1.16
+++ libipoddevice.spec	30 Jun 2008 17:12:00 -0000	1.17
@@ -3,13 +3,14 @@
 
 Name:    libipoddevice
 Version: 0.5.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Device-specific layer for the Apple iPod
 
 Group:   Development/Libraries
 License: LGPLv2
 URL:     http://banshee-project.org/Subprojects/Libipoddevice
 Source0: http://banshee-project.org/files/%{name}-%{version}.tar.gz
+Patch0:  libipoddevice-0.5.3-sg3_utils-1.26.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Mon Jun 30 2008 Dan Horak <dan[at]danny.cz> - 0.5.3-5
+- add patch for sg3_utils 1.26 and rebuild
+
 * Mon Oct 22 2007 Matthias Clasen  <mclasen at redhat.com> - 0.5.3-4
 - Rebuild against new dbus-glib