rpms/gnome-lirc-properties/devel glp-fedora-support.patch, NONE, 1.1 gnome-lirc-properties.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Fri Jul 4 21:13:05 UTC 2008 

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16789/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glp-fedora-support.patch gnome-lirc-properties.spec import.log 
Log Message:
* Thu Jul 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-2
- Update for the comments by Dan Horák in the review

* Tue Jul 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-1
- Update to 0.2.8

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-5
- Fix traceback when selecting device

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-4
- Consider a missing /etc/lircd.conf to be a valid configuration

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-3
- Fix desktop file

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-2
- Update for lirc changes

* Tue Jun 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-1
- Update against lirc with include support, and new upstream version

* Mon Apr 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.5-1
- First package


glp-fedora-support.patch:

--- NEW FILE glp-fedora-support.patch ---
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: gnome_lirc_properties/backend.py
===================================================================
--- gnome_lirc_properties/backend.py	(revision 44)
+++ gnome_lirc_properties/backend.py	(working copy)
@@ -493,8 +493,8 @@
     # The "REMOTE_" prefix is made optional, since it only was introduced
     # with lirc 0.8.3~pre1-0ubuntu4 of Hardy Heron.
 
-    __re_remote_directive = re.compile(r'^\s*(?:REMOTE_)?(DRIVER|DEVICE|MODULES|' +
-                                       r'LIRCD_ARGS|LIRCD_CONF|VENDOR|MODEL)=')
+    __re_remote_directive = re.compile(r'^\s*(LIRC_DRIVER|LIRC_DEVICE|MODULES|' +
+                                       r'LIRCD_OPTIONS|LIRCD_CONF|VENDOR|MODEL)=')
     __re_start_lircd      = re.compile(r'^\s*START_LIRCD=')
 
     def __init__(self, connection=None, path='/'):
@@ -593,6 +593,7 @@
                 continue
 
             # Deal with the START_LIRCD line:
+            # This doesn't do anything on Fedora
 
             match = self.__re_start_lircd.match(line)
 
@@ -604,7 +605,7 @@
                 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
 
             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():
-            print >> output, ('REMOTE_%s="%s"' % (key, value))
+            print >> output, ('%s="%s"' % (key, value))
 
         if receiver_values:
             print >> output, '\n# Receiver settings required by gnome-lirc-properties'
         for key, value in receiver_values.items():
             print >> output, ('RECEIVER_%s="%s"' % (key, value))
 
-        if start_lircd is not None:
-            print >> output, '\n# Daemon settings required by gnome-lirc-properties'
-            print >> output, ('START_LIRCD=%s' % start_lircd)
-
         # Replace old file with new contents:
 
         os.unlink(oldfile)
@@ -646,10 +643,10 @@
         self._check_permission(sender)
 
         remote_values = {
-            'DRIVER': driver,
-            'DEVICE': device,
+            'LIRC_DRIVER': driver,
+            'LIRC_DEVICE': device,
             'MODULES': modules,
-            'LIRCD_ARGS': '',
+            'LIRCD_OPTIONS': '',
             'LIRCD_CONF': '',
         }
 
@@ -767,10 +764,12 @@
         print 'Managing lircd: %s...' % action
 
         if 'enable' == action:
-            self._write_hardware_configuration(start_lircd=True)
+            args = '/sbin/chkconfig', 'lirc', 'on'
+            os.spawnv(os.P_WAIT, args[0], args)
 
         elif 'disable' == action:
-            self._write_hardware_configuration(start_lircd=False)
+            args = '/sbin/chkconfig', 'lirc', 'off'
+            os.spawnv(os.P_WAIT, args[0], args)
 
         else:
             args = '/etc/init.d/lirc', action
Index: gnome_lirc_properties/policykit.py
===================================================================
--- gnome_lirc_properties/policykit.py	(revision 44)
+++ gnome_lirc_properties/policykit.py	(working copy)
@@ -43,7 +43,7 @@
         authorized = self.policy_kit.IsProcessAuthorized(action_id, pid, False)
         logging.debug('%s: authorized=%r', action_id, authorized)
 
-        return ('no' != authorized)
+        return ('yes' == authorized)
 
     def obtain_authorization(self, widget, action_id=config.POLICY_KIT_ACTION):
         '''
Index: configure.ac
===================================================================
--- configure.ac	(revision 44)
+++ configure.ac	(working copy)
@@ -60,7 +60,7 @@
 	  HAVE_LIRCD="no"
   elif [[ "$LIRCD_MAJOR" -eq "0" ]] && \
 	  [[ "$LIRCD_MINOR" -eq "8" ]] && \
-	  [[ "$LIRCD_MICRO" -lt "4" ]]; then
+	  [[ "$LIRCD_MICRO" -lt "3" ]]; then
 	  AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION])
 	  HAVE_LIRCD="no"
   fi
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


--- NEW FILE gnome-lirc-properties.spec ---
%define		polkit_minver 0.7
%define		lirc_ver 0.8.3-4

# 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.2.8
Release:	2%{?dist}
Summary:	Infrared Remote Controls setup tool

Group:		User Interface/X Hardware Support
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
# 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
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	python >= 2.3
Requires:	PolicyKit >= %{polkit_minver}
Requires:	pygtk2
Requires:	lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver}

BuildRequires:	python-devel >= 2.3
BuildRequires:	PolicyKit-gnome-devel >= %{polkit_minver} gtk2-devel
BuildRequires:	gnome-doc-utils
BuildRequires:	lirc >= %{lirc_ver} lirc-remotes >= %{lirc_ver}

# For the Fedora patch
BuildRequires:	autoconf automake intltool

BuildArch:	noarch

%description
gnome-lirc-properties helps users set up infrared remote controls for use with
the LIRC framework.

%prep
%setup -q
%patch0 -p0 -b .fedora
autoconf

%build
%configure --disable-conf-check --with-lirc-confdir=%{_sysconfdir} --with-remotes-database=%{_datadir}/lirc-remotes/

make

%install
rm -rf $RPM_BUILD_ROOT

# use DESTDIR so compiled python files get tagged correctly with their
# final location
make DESTDIR=$RPM_BUILD_ROOT install

# Validate the desktop file
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-lirc-properties.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files -f %{name}.lang
%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}/dbus-1/system-services/org.gnome.LircProperties.Mechanism.service
%{_datadir}/applications/gnome-lirc-properties.desktop
%{_datadir}/gnome/help/gnome-lirc-properties/
%{_datadir}/icons/hicolor/*/apps/*
%{_mandir}/man1/*
%{_datadir}/omf/gnome-lirc-properties/
%{_bindir}/gnome-lirc-properties
%{python_sitelib}/gnome_lirc_properties
%{_datadir}/%{name}/

%changelog
* Thu Jul 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-2
- Update for the comments by Dan Horák in the review

* Tue Jul 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-1
- Update to 0.2.8

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-5
- Fix traceback when selecting device

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-4
- Consider a missing /etc/lircd.conf to be a valid configuration

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-3
- Fix desktop file

* Mon Jun 30 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-2
- Update for lirc changes

* Tue Jun 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.7-1
- Update against lirc with include support, and new upstream version

* Mon Apr 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.5-1
- First package



--- NEW FILE import.log ---
gnome-lirc-properties-0_2_8-2_fc9:HEAD:gnome-lirc-properties-0.2.8-2.fc9.src.rpm:1215205816


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jul 2008 19:44:28 -0000	1.1
+++ .cvsignore	4 Jul 2008 21:12:25 -0000	1.2
@@ -0,0 +1 @@
+gnome-lirc-properties-0.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jul 2008 19:44:28 -0000	1.1
+++ sources	4 Jul 2008 21:12:25 -0000	1.2
@@ -0,0 +1 @@
+ab01c9767c3d3c0370f64ae683368f82  gnome-lirc-properties-0.2.8.tar.gz

More information about the fedora-extras-commits mailing list