rpms/gnome-lirc-properties/F-11 fix-default-config-name-quoting.patch, NONE, 1.1 new-dbus-auth.patch, NONE, 1.1 gnome-lirc-properties.spec, 1.18, 1.19

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16879

Modified Files:
	gnome-lirc-properties.spec 
Added Files:
	fix-default-config-name-quoting.patch new-dbus-auth.patch 
Log Message:
* Tue Jun 30 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-4
- Add D-Bus patch to allow the front-end to run
- Fix overly enthusiastic quoting

fix-default-config-name-quoting.patch:

--- NEW FILE fix-default-config-name-quoting.patch ---
diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
index aee73be..881b7df 100644
--- a/gnome_lirc_properties/backend.py
+++ b/gnome_lirc_properties/backend.py
@@ -580,7 +580,10 @@ class BackendService(PolicyKitService):
 
             if value is not None:
                 logging.info('- writing %s"%s"', match.group(0), value)
-                print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
+		if value == "":
+                    print >> output, ('%s"%s"' % (match.group(0), value))
+                else:
+                    print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                 continue
 
             # Identify directives starting with RECEIVER_ and replacing their values with ours.
@@ -590,7 +593,10 @@ class BackendService(PolicyKitService):
 
             if value is not None:
                 logging.info('- writing %s"%s"', match.group(0), value)
-                print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
+		if value == "":
+                    print >> output, ('%s"%s"' % (match.group(0), value))
+	        else:
+                    print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                 continue
 
             # Deal with the START_LIRCD line:

new-dbus-auth.patch:

--- NEW FILE new-dbus-auth.patch ---
--- gnome-lirc-properties-0.3.1/data/org.gnome.LircProperties.Mechanism.conf.old	2009-06-30 12:29:09.000000000 +0100
+++ gnome-lirc-properties-0.3.1/data/org.gnome.LircProperties.Mechanism.conf	2009-06-30 12:29:17.000000000 +0100
@@ -15,5 +15,17 @@
     -->
   <policy user="root">
     <allow own="org.gnome.LircProperties.Mechanism"/>
+    <allow own="org.gnome.LircProperties.ExternalToolDriver"/>
+    <allow send_destination="org.gnome.LircProperties.Mechanism"/>
   </policy>
+
+  <!--
+    Any user can contact the service though, as the authentication
+    is done through PolicyKit
+  -->
+  <policy context="default">
+    <allow send_destination="org.gnome.LircProperties.Mechanism"/>
+    <allow send_destination="org.gnome.LircProperties.ExternalToolDriver"/>
+  </policy>
+
 </busconfig>


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/gnome-lirc-properties.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gnome-lirc-properties.spec	24 Feb 2009 23:02:59 -0000	1.18
+++ gnome-lirc-properties.spec	30 Jun 2009 11:56:23 -0000	1.19
@@ -1,3 +1,4 @@
+%define		_default_patch_fuzz 2
 %define		polkit_minver 0.8-3
 %define		lirc_ver 0.8.4-2
 
@@ -6,7 +7,7 @@
 
 Name:		gnome-lirc-properties
 Version:	0.3.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -22,6 +23,10 @@ Patch1:		glp-dont-use-fluendo-remotes.pa
 # https://bugzilla.redhat.com/show_bug.cgi?id=467340
 # http://bugzilla.gnome.org/show_bug.cgi?id=557429
 Patch2:		glp-remove-snapstream.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=563853
+Patch3:		new-dbus-auth.patch
+# http://git.gnome.org/cgit/gnome-lirc-properties/commit/?id=1f4673de56facbefbed6adb9465c358fbe93b0bc
+Patch4:		fix-default-config-name-quoting.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -48,6 +53,8 @@ the LIRC framework.
 %patch0 -p0 -b .fedora
 %patch1 -p0 -b .no-fluendo-remotes
 %patch2 -p0
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/
@@ -98,6 +105,10 @@ fi
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Jun 30 2009 Bastien Nocera <bnocera at redhat.com> 0.3.1-4
+- Add D-Bus patch to allow the front-end to run
+- Fix overly enthusiastic quoting
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild