rpms/blueproximity/F-13 blueproximity-python-ConfigObj.patch, NONE, 1.1 blueproximity.spec, 1.2, 1.3 import.log, 1.1, 1.2
Jonathan Steffan
jsteffan at fedoraproject.org
Mon Jun 7 00:03:18 UTC 2010
- Previous message: rpms/blueproximity/devel blueproximity-python-ConfigObj.patch, NONE, 1.1 blueproximity.spec, 1.2, 1.3 import.log, 1.1, 1.2
- Next message: rpms/blam/F-12 blam-1.8.7-webkit.patch,NONE,1.1 blam.spec,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jsteffan
Update of /cvs/pkgs/rpms/blueproximity/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv441/F-13
Modified Files:
blueproximity.spec import.log
Added Files:
blueproximity-python-ConfigObj.patch
Log Message:
Update to support new python ConfigObj
blueproximity-python-ConfigObj.patch:
proximity.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE blueproximity-python-ConfigObj.patch ---
--- proximity.py.orig 2010-06-06 17:22:25.454729310 -0600
+++ proximity.py 2010-06-06 17:23:04.963753212 -0600
@@ -1257,7 +1257,7 @@
if filename.endswith('.conf'):
try:
# add every valid .conf file to the array of configs
- config = ConfigObj(os.path.join(conf_dir,filename),{'create_empty':False,'file_error':True,'configspec':conf_specs})
+ config = ConfigObj(os.path.join(conf_dir,filename),**{'create_empty':False,'file_error':True,'configspec':conf_specs})
# first validate it
config.validate(vdt, copy=True)
# rewrite it in a secure manner
@@ -1271,7 +1271,7 @@
# no previous configuration could be found so let's create a new one
if new_config:
- config = ConfigObj(os.path.join(conf_dir, _('standard') + '.conf'),{'create_empty':True,'file_error':False,'configspec':conf_specs})
+ config = ConfigObj(os.path.join(conf_dir, _('standard') + '.conf'),**{'create_empty':True,'file_error':False,'configspec':conf_specs})
# next line fixes a problem with creating empty strings in default values for configobj
config['device_mac'] = ''
config.validate(vdt, copy=True)
Index: blueproximity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blueproximity/F-13/blueproximity.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blueproximity.spec 24 Jul 2009 18:15:15 -0000 1.2
+++ blueproximity.spec 7 Jun 2010 00:03:18 -0000 1.3
@@ -1,6 +1,6 @@
Name: blueproximity
Version: 1.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Detects you via your bluetooth devices and locks/unlocks the screen
BuildArch: noarch
Group: Applications/Communications
@@ -10,9 +10,12 @@ Source0: http://downloads.sourceforge.ne
Source1: %{name}.desktop
Patch0: blueproximity-fedorization.diff
Patch1: blueproximity-fix-bash-script.diff
+Patch2: blueproximity-python-ConfigObj.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils, gettext
-Requires: python-configobj, pybluez, pygtk2-libglade
+Requires: pybluez, pygtk2-libglade
+# Required due to Patch2
+Requires: python-configobj >= 4.7.0
%description
Add security to your desktop by automatically locking and unlocking
@@ -23,6 +26,7 @@ proximity detector for your mobile phone
%setup -q -n %{name}-%{version}.orig
%patch0 -p0 -b .fedorization
%patch1 -p0 -b .fix-bash-script
+%patch2 -p0 -b .ConfigObj
%build
@@ -77,6 +81,9 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/%{name}_base.svg
%changelog
+* Sun Jun 6 2010 Jonathan Steffan <jsteffan at fedoraproject.org> - 1.2.5-6
+- Add patch for python ConfigObj changes
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/blueproximity/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 20 Jun 2009 19:56:48 -0000 1.1
+++ import.log 7 Jun 2010 00:03:18 -0000 1.2
@@ -1 +1,2 @@
blueproximity-1_2_5-4_fc9:HEAD:blueproximity-1.2.5-4.fc9.src.rpm:1245527774
+blueproximity-1_2_5-6_fc13:F-13:blueproximity-1.2.5-6.fc13.src.rpm:1275868973
- Previous message: rpms/blueproximity/devel blueproximity-python-ConfigObj.patch, NONE, 1.1 blueproximity.spec, 1.2, 1.3 import.log, 1.1, 1.2
- Next message: rpms/blam/F-12 blam-1.8.7-webkit.patch,NONE,1.1 blam.spec,1.41,1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list