rpms/gnome-lirc-properties/devel glp-fedora-support.patch, 1.5, 1.6 gnome-lirc-properties.spec, 1.22, 1.23

[Bastien Nocera]

Author: hadess

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

Modified Files:
	glp-fedora-support.patch gnome-lirc-properties.spec 
Log Message:
Update filelist

glp-fedora-support.patch:
 backend.py                    |   49 ++++++++++++++++++++----------------------
 config.py.in                  |    2 -
 ui/RemoteControlProperties.py |    5 +---
 3 files changed, 27 insertions(+), 29 deletions(-)

Index: glp-fedora-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/glp-fedora-support.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glp-fedora-support.patch	15 Sep 2009 09:46:49 -0000	1.5
+++ glp-fedora-support.patch	15 Sep 2009 10:06:53 -0000	1.6
@@ -1,8 +1,19 @@
+From fcebc7a9c8a240de4920fd1fc29781c8d4930897 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 10 Sep 2009 15:54:49 +0100
+Subject: [PATCH 1/2] Fedora support
+
+---
+ gnome_lirc_properties/backend.py                   |   49 ++++++++++----------
+ gnome_lirc_properties/config.py.in                 |    2 +-
+ .../ui/RemoteControlProperties.py                  |    4 +-
+ 3 files changed, 27 insertions(+), 28 deletions(-)
+
 diff --git a/gnome_lirc_properties/backend.py b/gnome_lirc_properties/backend.py
-index 881b7df..1bff4c1 100644
+index 2475b21..56244f3 100644
 --- a/gnome_lirc_properties/backend.py
 +++ b/gnome_lirc_properties/backend.py
-@@ -494,8 +494,8 @@ class BackendService(PolicyKitService):
+@@ -497,8 +497,8 @@ class BackendService(PolicyKitService):
      # The "REMOTE_" prefix is made optional, since it only was introduced
      # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
  
@@ -13,7 +24,7 @@ index 881b7df..1bff4c1 100644
      __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
  
      def __init__(self, connection=None, path='/'):
-@@ -599,22 +599,23 @@ class BackendService(PolicyKitService):
+@@ -602,22 +602,23 @@ class BackendService(PolicyKitService):
                      print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
                  continue
  
@@ -50,7 +61,7 @@ index 881b7df..1bff4c1 100644
  
          # Write out any values that were not already in the file,
          # and therefore just replaced:
-@@ -622,17 +623,13 @@ class BackendService(PolicyKitService):
+@@ -625,17 +626,13 @@ class BackendService(PolicyKitService):
          if remote_values:
              print >> output, '\n# Remote settings required by gnome-lirc-properties'
          for key, value in remote_values.items():
@@ -69,7 +80,7 @@ index 881b7df..1bff4c1 100644
          # Replace old file with new contents:
  
          os.unlink(oldfile)
-@@ -653,10 +650,10 @@ class BackendService(PolicyKitService):
+@@ -656,10 +653,10 @@ class BackendService(PolicyKitService):
          self._check_permission(sender)
  
          remote_values = {
@@ -83,7 +94,7 @@ index 881b7df..1bff4c1 100644
              'LIRCD_CONF': '',
          }
  
-@@ -779,10 +776,12 @@ class BackendService(PolicyKitService):
+@@ -782,10 +779,12 @@ class BackendService(PolicyKitService):
  	    raise AccessDeniedException
  
          if 'enable' == action:
@@ -99,12 +110,12 @@ index 881b7df..1bff4c1 100644
          else:
              args = '/etc/init.d/lirc', action
 diff --git a/gnome_lirc_properties/config.py.in b/gnome_lirc_properties/config.py.in
-index 69b232c..68b435c 100644
+index eeeda1c..0fd3f69 100644
 --- a/gnome_lirc_properties/config.py.in
 +++ b/gnome_lirc_properties/config.py.in
-@@ -12,7 +12,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
- 
+@@ -13,7 +13,7 @@ PACKAGE_DIR           = path.join('@prefix@', 'share', '@PACKAGE@')
  LIRC_CONFDIR          = '@with_lirc_confdir@'
+ LIRCD_SOCKET          = '@with_lircd_socket@'
  
 -LIRC_HARDWARE_CONF    = path.join(LIRC_CONFDIR, 'hardware.conf')
 +LIRC_HARDWARE_CONF    = path.join('@sysconfdir@', 'sysconfig', 'lirc')
@@ -131,3 +142,6 @@ index e65af35..f6e3fd4 100644
          )
  
          # Try to select configured remote vendor:
+-- 
+1.6.2.5
+


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-lirc-properties.spec	15 Sep 2009 09:46:50 -0000	1.22
+++ gnome-lirc-properties.spec	15 Sep 2009 10:06:53 -0000	1.23
@@ -82,7 +82,7 @@ fi
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README AUTHORS
 %{_sysconfdir}/dbus-1/system.d/org.gnome.LircProperties.Mechanism.conf
-%{_datadir}/PolicyKit/policy/gnome-lirc-properties-mechanism.policy
+%{_datadir}/polkit-1/actions/org.gnome.lirc-properties.mechanism.policy
 %{_datadir}/dbus-1/system-services/org.gnome.LircProperties.Mechanism.service
 %{_datadir}/hal/fdi/policy/10osvendor/*.fdi
 %{_datadir}/applications/gnome-lirc-properties.desktop