rpms/gtg/devel gtg-0.2.4-714.patch, NONE, 1.1 gtg-0.2.4-tryX.patch, NONE, 1.1 gtg.spec, 1.12, 1.13
Yanko Kaneti
yaneti at fedoraproject.org
Thu Jun 10 12:42:51 UTC 2010
Author: yaneti
Update of /cvs/pkgs/rpms/gtg/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15728
Modified Files:
gtg.spec
Added Files:
gtg-0.2.4-714.patch gtg-0.2.4-tryX.patch
Log Message:
0.2.4-2
- Avoid "RuntimeError: not holding the import lock" with recent pythons, from upstream
- Alternative X test, avoiding the xorg-x11-utils dependency
- Requires dbus-python
gtg-0.2.4-714.patch:
openurl.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- NEW FILE gtg-0.2.4-714.patch ---
=== modified file 'GTG/tools/openurl.py'
--- GTG/tools/openurl.py 2009-09-24 13:15:17 +0000
+++ GTG/tools/openurl.py 2010-04-14 22:18:17 +0000
@@ -50,14 +50,18 @@
status = _os.waitpid(pid, 0)[1]
return _os.WIFEXITED(status) and (_os.WEXITSTATUS(status) == 0)
-def _test_executable(*args):
- return _spawn_executable(True, True, *args)
+def _test_executable(name):
+ for path in _os.getenv('PATH').split(':'):
+ if _os.path.isfile(_os.path.join(path, name)):
+ if _os.access(_os.path.join(path, name), _os.X_OK):
+ return True
+ return False
def _spawn_quiet(*args):
return _spawn_executable(True, False, *args)
-_has_xdg = _test_executable('xdg-open', '--help')
-_has_exo = _test_executable('exo-open', '--help')
+_has_xdg = _test_executable('xdg-open')
+_has_exo = _test_executable('exo-open')
def openurl(url):
if _has_xdg: # freedesktop is the best choice :p
gtg-0.2.4-tryX.patch:
gtg | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
--- NEW FILE gtg-0.2.4-tryX.patch ---
=== modified file 'gtg'
--- gtg 2010-02-09 10:26:27 +0000
+++ gtg 2010-06-10 11:23:04 +0000
@@ -31,20 +31,16 @@
from optparse import OptionParser
-def X_is_running():
- from subprocess import Popen, PIPE
- p = Popen(["xset", "-q"], stdout=PIPE, stderr=PIPE)
- p.communicate()
- return p.returncode == 0
-
try:
parser = OptionParser()
parser.add_option("-d", "--debug",
action="store_true", dest="debug", help="enable debug output")
(options, args) = parser.parse_args()
- if not X_is_running():
- print "Could not open X display"
+ try:
+ import gtk
+ except RuntimeError, err:
+ print "RuntimeError:", err
sys.exit(1)
else:
Index: gtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtg/devel/gtg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gtg.spec 11 Apr 2010 09:06:58 -0000 1.12
+++ gtg.spec 10 Jun 2010 12:42:50 -0000 1.13
@@ -3,7 +3,7 @@
Name: gtg
Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Personal organizer for the GNOME desktop
Group: Applications/Productivity
@@ -12,12 +12,19 @@ URL: http://gtg.fritalk.com
BuildArch: noarch
Source0: http://launchpad.net/%{name}/%{gtg_milestone}/%{version}/+download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Alternative way of testing for X, does not bring additional dependencies
+Patch0: gtg-0.2.4-tryX.patch
+# lp bug 537885
+# http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/714 ,
+# avoids "RuntimeError: not holding the import lock" with recent pythons
+Patch1: gtg-0.2.4-714.patch
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: pyxdg
Requires: pygtk2 pygtk2-libglade python-configobj pyxdg pycairo gnome-python2-gnome
+Requires: dbus-python
%description
Getting Things GNOME! (GTG) is a personal organizer for the GNOME desktop
@@ -28,6 +35,8 @@ used as more than just GTD software.
%prep
%setup -q
+%patch0 -p0 -b .tryX
+%patch1 -p0 -b .714
sed -i -e "s|#!/usr/bin/env python||" GTG/gtg.py
@@ -73,6 +82,11 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Thu Jun 10 2010 Yanko Kaneti <yaneti at declera.com> 0.2.4-2
+- Avoid "RuntimeError: not holding the import lock" with recent pythons, from upstream
+- Alternative X test, avoiding the xorg-x11-utils dependency
+- Requires dbus-python
+
* Sun Apr 11 2010 Yanko Kaneti <yaneti at declera.com> 0.2.4-1
- New bugfix release from upstream
More information about the scm-commits
mailing list