rpms/libgpod/F-9 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch, NONE, 1.1 libgpod.spec, 1.15, 1.16

[Todd M. Zullinger]

Author: tmz

Update of /cvs/extras/rpms/libgpod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26043

Modified Files:
	libgpod.spec 
Added Files:
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch 
Log Message:
* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-5
- Fix path to hal callout (this should help setup the SysInfoExtended
  file automagically)
- Use /var/run/hald as mount dir for hal callout
- Require hal for the callout and .fdi directories
- Require main package for the -doc subpackage
- Require glib2-devel and gtk2-devel for the -devel subpackage (#446442)
- Add gdk-pixbuf-2.0 to the pkg-config file requirements


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

--- NEW FILE 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch ---
>From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
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



Index: libgpod.spec
===================================================================
RCS file: /cvs/extras/rpms/libgpod/F-9/libgpod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgpod.spec	12 Feb 2008 08:34:06 -0000	1.15
+++ libgpod.spec	15 Jan 2009 04:11:26 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -11,6 +11,8 @@
 Patch0: libgpod-0.6.0-photoremove.patch
 Patch1: libgpod-0.6.0-ipod-touch-typos.patch
 Patch2: libgpod-0.6.0-spl-tracklen.patch
+# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
+Patch3: 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
@@ -24,6 +26,7 @@
 Buildrequires: python-mutagen
 Buildrequires: sg3_utils-devel
 Buildrequires: swig
+Requires: hal
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -34,6 +37,8 @@
 Summary: Development files for the libgpod library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel
+Requires: gtk2-devel
 Requires: pkgconfig
 
 %description devel
@@ -48,6 +53,7 @@
 Summary: API documentation for the libgpod library
 Group: Documentation
 License: GFDL
+Requires: %{name} = %{version}-%{release}
 Requires: gtk-doc
 
 %description doc
@@ -73,15 +79,19 @@
 %patch0 -p0 -b .photoremove
 %patch1 -p0 -b .ipod-touch-typos
 %patch2 -p0 -b .spl-tracklen
+%patch3 -p1 -b .selinux
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure
+%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}
@@ -105,7 +115,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libdir}/hal/*
+%{_libdir}/hal/scripts/*
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 
 
@@ -132,6 +142,15 @@
 
 
 %changelog
+* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-5
+- Fix path to hal callout (this should help setup the SysInfoExtended
+  file automagically)
+- Use /var/run/hald as mount dir for hal callout
+- Require hal for the callout and .fdi directories
+- Require main package for the -doc subpackage
+- Require glib2-devel and gtk2-devel for the -devel subpackage (#446442)
+- Add gdk-pixbuf-2.0 to the pkg-config file requirements
+
 * Tue Feb 12 2008 Todd Zullinger <tmz at pobox.com> - 0.6.0-4
 - rebuild for gcc 4.3