rpms/gnome-lirc-properties/devel glp-fedora-support.patch, 1.2, 1.3 gnome-lirc-properties.spec, 1.14, 1.15

[Bastien Nocera]

Author: hadess

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

Modified Files:
	glp-fedora-support.patch gnome-lirc-properties.spec 
Log Message:
* Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-5
- Fix chkconfig not being called to auto-start lirc in some cases


glp-fedora-support.patch:

Index: glp-fedora-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/glp-fedora-support.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glp-fedora-support.patch	22 Oct 2008 15:31:16 -0000	1.2
+++ glp-fedora-support.patch	27 Oct 2008 15:46:20 -0000	1.3
@@ -31,9 +31,22 @@
          )
  
          # Try to select configured remote vendor:
+Index: data/gnome-lirc-properties.desktop.in.in
+===================================================================
+--- data/gnome-lirc-properties.desktop.in.in	(revision 44)
++++ data/gnome-lirc-properties.desktop.in.in	(working copy)
+@@ -7,7 +7,7 @@
+ Exec=@prefix@/bin/gnome-lirc-properties
+ Icon=gnome-lirc-properties
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;HardwareSettings;System;
++Categories=GNOME;GTK;Settings;HardwareSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-lirc-properties
+ X-GNOME-Bugzilla-Component=general
 Index: gnome_lirc_properties/backend.py
 ===================================================================
---- gnome_lirc_properties/backend.py	(revision 44)
+--- gnome_lirc_properties/backend.py	(revision 72)
 +++ gnome_lirc_properties/backend.py	(working copy)
 @@ -493,8 +493,8 @@
      # The "REMOTE_" prefix is made optional, since it only was introduced
@@ -46,24 +59,44 @@
      __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
  
      def __init__(self, connection=None, path='/'):
-@@ -593,6 +593,7 @@
+@@ -592,40 +592,37 @@
+                 print >> output, ('%s"%s"' % (match.group(0), value))
                  continue
  
-             # Deal with the START_LIRCD line:
-+            # This doesn't do anything on Fedora
+-            # Deal with the START_LIRCD line:
++            output.write(line)
  
-             match = self.__re_start_lircd.match(line)
+-            match = self.__re_start_lircd.match(line)
++        # Check whether we need to enable or disable lircd
  
-@@ -604,7 +605,7 @@
-                 value = (start_lircd is None) and 'true' or start_lircd
-                 start_lircd = None
+-            if match:
+-                # pychecker says "Using a conditional statement with a constant value (true)",
+-                # which is ridicilous, considering Python 2.4 doesn't have conditional statements
+-                # yet (PEP 308, aka. 'true_value if condition else false_value') and the expression
+-                # below ('condition and true_value or false_value') is the recommended aquivalent.
+-                value = (start_lircd is None) and 'true' or start_lircd
+-                start_lircd = None
++        # pychecker says "Using a conditional statement with a constant value (true)",
++        # which is ridicilous, considering Python 2.4 doesn't have conditional statements
++        # yet (PEP 308, aka. 'true_value if condition else false_value') and the expression
++        # below ('condition and true_value or false_value') is the recommended aquivalent.
++        value = (start_lircd is None) and 'true' or start_lircd
++        start_lircd = None
  
 -                print >> output, (match.group(0) + value)
-+                # print >> output, (match.group(0) + value)
-                 continue
+-                continue
++        if 'true' == value:
++             args = '/sbin/chkconfig', 'lirc', 'on'
++             os.spawnv(os.P_WAIT, args[0], args)
++        else:
++             args = '/sbin/chkconfig', 'lirc', 'off'
++             os.spawnv(os.P_WAIT, args[0], args)
+ 
+-            output.write(line)
+-
+         # Write out any values that were not already in the file,
+         # and therefore just replaced:
  
-             output.write(line)
-@@ -615,17 +616,13 @@
          if remote_values:
              print >> output, '\n# Remote settings required by gnome-lirc-properties'
          for key, value in remote_values.items():
@@ -111,16 +144,3 @@
  
          else:
              args = '/etc/init.d/lirc', action
-Index: data/gnome-lirc-properties.desktop.in.in
-===================================================================
---- data/gnome-lirc-properties.desktop.in.in	(revision 44)
-+++ data/gnome-lirc-properties.desktop.in.in	(working copy)
-@@ -7,7 +7,7 @@
- Exec=@prefix@/bin/gnome-lirc-properties
- Icon=gnome-lirc-properties
- StartupNotify=true
--Categories=GNOME;GTK;Settings;HardwareSettings;System;
-+Categories=GNOME;GTK;Settings;HardwareSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-lirc-properties
- X-GNOME-Bugzilla-Component=general


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-lirc-properties.spec	27 Oct 2008 12:51:55 -0000	1.14
+++ gnome-lirc-properties.spec	27 Oct 2008 15:46:20 -0000	1.15
@@ -6,7 +6,7 @@
 
 Name:		gnome-lirc-properties
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -103,6 +103,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-5
+- Fix chkconfig not being called to auto-start lirc in some cases
+
 * Mon Oct 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.0-4
 - Fix USB hiddev devices causing backtraces