rpms/libgpod/F-13 0001-Make-the-temporary-mount-point-configurable.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 libgpod.spec, 1.30, 1.31 sources, 1.9, 1.10 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch, 1.1, NONE

Thu Mar 4 15:52:30 UTC 2010

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26061

Modified Files:
	.cvsignore libgpod.spec sources 
Added Files:
	0001-Make-the-temporary-mount-point-configurable.patch 
Removed Files:
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch 
Log Message:
* Thu Mar 04 2010 Bastien Nocera <bnocera at redhat.com> 0.7.91-1
- Update to 0.7.91
- Use udev callout, disable HAL callouts
- Enable iPhone/iPod Touch support


0001-Make-the-temporary-mount-point-configurable.patch:
 configure.ac            |   15 +++++++++++++++
 tools/Makefile.am       |    9 +++++++++
 tools/generic-callout.c |    3 +--
 3 files changed, 25 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Make-the-temporary-mount-point-configurable.patch ---
>From bd44ab460a2f0d531df0b6b34176efaf6a0641ac Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Feb 2010 21:17:16 -0000	1.8
+++ .cvsignore	4 Mar 2010 15:52:30 -0000	1.9
@@ -1 +1 @@
-libgpod-0.7.90.tar.gz
+libgpod-0.7.91.tar.gz


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-13/libgpod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libgpod.spec	14 Feb 2010 21:17:16 -0000	1.30
+++ libgpod.spec	4 Mar 2010 15:52:30 -0000	1.31
@@ -2,20 +2,17 @@
 
 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
 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 +21,17 @@ 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
+
+# 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,
@@ -82,14 +84,15 @@ libgpod library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .selinux
+%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
 
 
 %build
-%configure --with-hal-callouts-dir=%{_libexecdir}/scripts
+%configure --without-hal --enable-udev --with-mount-dir=%{_localstatedir}/run/libgpod
 %{__make} %{?_smp_mflags}
 
 
@@ -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,9 +119,10 @@ libgpod library.
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libexecdir}/scripts/*
-%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
-
+%dir %{_localstatedir}/run/libgpod/
+/lib/udev/iphone-set-info
+/lib/udev/ipod-set-info
+/lib/udev/rules.d/libgpod.rules
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -142,6 +147,11 @@ libgpod library.
 
 
 %changelog
+* Thu Mar 04 2010 Bastien Nocera <bnocera at redhat.com> 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 <tmz at pobox.com> - 0.7.90-1
 - Update to 0.7.90
 - Adjust default hal callout path (#547049)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Feb 2010 21:17:16 -0000	1.9
+++ sources	4 Mar 2010 15:52:30 -0000	1.10
@@ -1 +1 @@
-b81988f262074a0712362dd10673951c  libgpod-0.7.90.tar.gz
+172c35369a7013bbf84917b31be758f3  libgpod-0.7.91.tar.gz


--- 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch DELETED ---

