rpms/gnome-lirc-properties/F-11 .cvsignore, 1.4, 1.5 glp-fedora-support.patch, 1.4, 1.5 gnome-lirc-properties.spec, 1.19, 1.20 sources, 1.4, 1.5 fix-default-config-name-quoting.patch, 1.1, NONE glp-dont-use-fluendo-remotes.patch, 1.1, NONE glp-remove-snapstream.patch, 1.1, NONE new-dbus-auth.patch, 1.1, NONE
Bastien Nocera
hadess at fedoraproject.org
Tue Sep 15 10:13:30 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/gnome-lirc-properties/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18385
Modified Files:
.cvsignore glp-fedora-support.patch gnome-lirc-properties.spec
sources
Removed Files:
fix-default-config-name-quoting.patch
glp-dont-use-fluendo-remotes.patch glp-remove-snapstream.patch
new-dbus-auth.patch
Log Message:
* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
- Update to 0.4.0
- Drop upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 27 Oct 2008 17:32:33 -0000 1.4
+++ .cvsignore 15 Sep 2009 10:13:29 -0000 1.5
@@ -1 +1 @@
-gnome-lirc-properties-0.3.1.tar.gz
+gnome-lirc-properties-0.4.0.tar.gz
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/F-11/glp-fedora-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- glp-fedora-support.patch 27 Oct 2008 17:32:34 -0000 1.4
+++ glp-fedora-support.patch 15 Sep 2009 10:13:30 -0000 1.5
@@ -1,54 +1,19 @@
-Index: gnome_lirc_properties/config.py.in
-===================================================================
---- gnome_lirc_properties/config.py.in (revision 44)
-+++ gnome_lirc_properties/config.py.in (working copy)
-@@ -12,7 +12,7 @@
-
- LIRC_CONFDIR = '@with_lirc_confdir@'
-
--LIRC_HARDWARE_CONF = path.join(LIRC_CONFDIR, 'hardware.conf')
-+LIRC_HARDWARE_CONF = path.join('@sysconfdir@', 'sysconfig', 'lirc')
- LIRC_REMOTE_CONF = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
- LIRC_DAEMON_CONF = path.join(LIRC_CONFDIR, 'lircd.conf')
-
-Index: gnome_lirc_properties/ui/RemoteControlProperties.py
-===================================================================
---- gnome_lirc_properties/ui/RemoteControlProperties.py (revision 44)
-+++ gnome_lirc_properties/ui/RemoteControlProperties.py (working copy)
-@@ -297,13 +297,13 @@
- #
- # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
- # receiver settings in "hardware.conf", whereas we have to. For that
-- # reason the device node's name is stored in REMOTE_DEVICE, instead
-+ # reason the device node's name is stored in LIRC_DEVICE, instead
- # of RECEIVER_DEVICE.
- #
- self.selected_receiver = (
- settings.get('RECEIVER_VENDOR'),
- settings.get('RECEIVER_MODEL'),
-- settings.get('REMOTE_DEVICE'),
-+ settings.get('LIRC_DEVICE'),
- )
-
- # 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 76)
-+++ gnome_lirc_properties/backend.py (working copy)
-@@ -494,8 +494,8 @@
+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 2475b21..56244f3 100644
+--- a/gnome_lirc_properties/backend.py
++++ b/gnome_lirc_properties/backend.py
+@@ -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.
@@ -59,15 +24,14 @@ Index: gnome_lirc_properties/backend.py
__re_start_lircd = re.compile(r'^\s*START_LIRCD=')
def __init__(self, connection=None, path='/'):
-@@ -593,40 +593,37 @@
- print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
+@@ -602,22 +602,23 @@ class BackendService(PolicyKitService):
+ print >> output, ('%s"%s"' % (match.group(0), ShellQuote.shellquote(value)))
continue
- # Deal with the START_LIRCD line:
-+ output.write(line)
-
+-
- match = self.__re_start_lircd.match(line)
-+ # Check whether we need to enable or disable lircd
++ output.write(line)
- if match:
- # pychecker says "Using a conditional statement with a constant value (true)",
@@ -76,6 +40,10 @@ Index: gnome_lirc_properties/backend.py
- # 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
++ # Check whether we need to enable or disable lircd
+
+- print >> output, (match.group(0) + ShellQuote.shellquote(value))
+- continue
+ # 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
@@ -83,8 +51,7 @@ Index: gnome_lirc_properties/backend.py
+ value = (start_lircd is None) and 'true' or start_lircd
+ start_lircd = None
-- print >> output, (match.group(0) + ShellQuote.shellquote(value))
-- continue
+- output.write(line)
+ if 'true' == value:
+ args = '/sbin/chkconfig', 'lirc', 'on'
+ os.spawnv(os.P_WAIT, args[0], args)
@@ -92,11 +59,9 @@ Index: gnome_lirc_properties/backend.py
+ 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:
-
+@@ -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():
@@ -115,7 +80,7 @@ Index: gnome_lirc_properties/backend.py
# Replace old file with new contents:
os.unlink(oldfile)
-@@ -647,10 +644,10 @@
+@@ -656,10 +653,10 @@ class BackendService(PolicyKitService):
self._check_permission(sender)
remote_values = {
@@ -129,7 +94,7 @@ Index: gnome_lirc_properties/backend.py
'LIRCD_CONF': '',
}
-@@ -773,10 +770,12 @@
+@@ -782,10 +779,12 @@ class BackendService(PolicyKitService):
raise AccessDeniedException
if 'enable' == action:
@@ -144,3 +109,39 @@ Index: gnome_lirc_properties/backend.py
else:
args = '/etc/init.d/lirc', action
+diff --git a/gnome_lirc_properties/config.py.in b/gnome_lirc_properties/config.py.in
+index eeeda1c..0fd3f69 100644
+--- a/gnome_lirc_properties/config.py.in
++++ b/gnome_lirc_properties/config.py.in
+@@ -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')
+ LIRC_REMOTE_CONF = path.join(LIRC_CONFDIR, 'lircd.conf.gnome')
+ LIRC_DAEMON_CONF = path.join(LIRC_CONFDIR, 'lircd.conf')
+
+diff --git a/gnome_lirc_properties/ui/RemoteControlProperties.py b/gnome_lirc_properties/ui/RemoteControlProperties.py
+index e65af35..f6e3fd4 100644
+--- a/gnome_lirc_properties/ui/RemoteControlProperties.py
++++ b/gnome_lirc_properties/ui/RemoteControlProperties.py
+@@ -296,13 +296,13 @@ class RemoteControlProperties(object):
+ #
+ # NOTE: Ubuntu's lirc script doesn't distinguish between remote and
+ # receiver settings in "hardware.conf", whereas we have to. For that
+- # reason the device node's name is stored in REMOTE_DEVICE, instead
++ # reason the device node's name is stored in LIRC_DEVICE, instead
+ # of RECEIVER_DEVICE.
+ #
+ self.selected_receiver = (
+ settings.get('RECEIVER_VENDOR'),
+ settings.get('RECEIVER_MODEL'),
+- settings.get('REMOTE_DEVICE'),
++ settings.get('LIRC_DEVICE'),
+ )
+
+ # Try to select configured remote vendor:
+--
+1.6.2.5
+
Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/gnome-lirc-properties.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-lirc-properties.spec 30 Jun 2009 11:56:23 -0000 1.19
+++ gnome-lirc-properties.spec 15 Sep 2009 10:13:30 -0000 1.20
@@ -1,13 +1,12 @@
-%define _default_patch_fuzz 2
%define polkit_minver 0.8-3
-%define lirc_ver 0.8.4-2
+%define lirc_ver 0.8.6-1
# Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: gnome-lirc-properties
-Version: 0.3.1
-Release: 4%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Summary: Infrared Remote Controls setup tool
Group: User Interface/X Hardware Support
@@ -15,18 +14,7 @@ License: GPLv2+
URL: http://svn.gnome.org/svn/gnome-lirc-properties/trunk
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-lirc-properties/0.2/%{name}-%{version}.tar.gz
# http://bugzilla.gnome.org/show_bug.cgi?id=530359 and blockers
-# http://bugzilla.gnome.org/show_bug.cgi?id=540897
-# and We have the patches in a 0.8.3 version in Fedora
Patch0: glp-fedora-support.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=556585
-Patch1: glp-dont-use-fluendo-remotes.patch
-# 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)
@@ -51,10 +39,6 @@ the LIRC framework.
%prep
%setup -q
%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/
@@ -105,6 +89,10 @@ fi
%{_datadir}/%{name}/
%changelog
+* Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 0.4.0-1
+- Update to 0.4.0
+- Drop upstreamed patches
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 27 Oct 2008 17:32:34 -0000 1.4
+++ sources 15 Sep 2009 10:13:30 -0000 1.5
@@ -1 +1 @@
-6bb73e97ec08969c27d59cf578bc349f gnome-lirc-properties-0.3.1.tar.gz
+672a58a3d80fa0573527381db5dd14f9 gnome-lirc-properties-0.4.0.tar.gz
--- fix-default-config-name-quoting.patch DELETED ---
--- glp-dont-use-fluendo-remotes.patch DELETED ---
--- glp-remove-snapstream.patch DELETED ---
--- new-dbus-auth.patch DELETED ---
More information about the scm-commits
mailing list