From 987ff20d7ba9b54f118ca2664c09e06618729771a2c5ed8ab27f04e14b032386 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 2 Jul 2011 18:03:29 +0000 Subject: [PATCH] Accepting request 75178 from home:vuntz:branches:devel:languages:python Update to 0.60.0 OBS-URL: https://build.opensuse.org/request/show/75178 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtkey?expand=0&rev=5 --- python-virtkey-0.50.tar.bz2 | 3 --- python-virtkey-0.60.0.tar.gz | 3 +++ python-virtkey-use-pkg-config.patch | 30 ----------------------------- python-virtkey.changes | 21 ++++++++++++++++++++ python-virtkey.spec | 26 +++++++++++-------------- 5 files changed, 35 insertions(+), 48 deletions(-) delete mode 100644 python-virtkey-0.50.tar.bz2 create mode 100644 python-virtkey-0.60.0.tar.gz delete mode 100644 python-virtkey-use-pkg-config.patch diff --git a/python-virtkey-0.50.tar.bz2 b/python-virtkey-0.50.tar.bz2 deleted file mode 100644 index 4c782e1..0000000 --- a/python-virtkey-0.50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cfb50a6fa9f7f08bf390356853a772c594c9a9f46d4f2e41fd7a43f43e215c6 -size 19290 diff --git a/python-virtkey-0.60.0.tar.gz b/python-virtkey-0.60.0.tar.gz new file mode 100644 index 0000000..68242db --- /dev/null +++ b/python-virtkey-0.60.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8de93ded985454484e6d2e52ce86b4c7aae65bc3cd97fc8aa7259def2a091a1 +size 40328 diff --git a/python-virtkey-use-pkg-config.patch b/python-virtkey-use-pkg-config.patch deleted file mode 100644 index cf37820..0000000 --- a/python-virtkey-use-pkg-config.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: python-virtkey-0.50/setup.py -=================================================================== ---- python-virtkey-0.50.orig/setup.py -+++ python-virtkey-0.50/setup.py -@@ -1,10 +1,23 @@ - #!/usr/bin/python - - from distutils.core import setup, Extension -+import commands -+ -+# From http://code.activestate.com/recipes/502261-python-distutils-pkg-config/ -+def pkgconfig(*packages, **kw): -+ flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} -+ for token in commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split(): -+ if flag_map.has_key(token[:2]): -+ kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) -+ else: # throw others to extra_link_args -+ kw.setdefault('extra_link_args', []).append(token) -+ for k, v in kw.iteritems(): # remove duplicated -+ kw[k] = list(set(v)) -+ return kw -+ - setup(name="virtkey", - ext_modules=[Extension("virtkey", -- ["python-virtkey.c","ucs2keysym.c"],include_dirs=['/usr/include/gtk-2.0', '/usr/include/glib-2.0', '/usr/lib/glib-2.0/include', '/usr/include/pango-1.0', '/usr/lib/gtk-2.0/include', '/usr/include/cairo'], -- libraries=["X11","Xtst","glib-2.0","gdk-x11-2.0"] -+ ["python-virtkey.c","ucs2keysym.c"], **pkgconfig('glib-2.0', 'gdk-2.0', 'x11', 'xtst') - )], - version="0.01" - ) diff --git a/python-virtkey.changes b/python-virtkey.changes index ebbd9b9..90ac810 100644 --- a/python-virtkey.changes +++ b/python-virtkey.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat Jul 2 19:46:16 CEST 2011 - vuntz@opensuse.org + +- Update to version 0.60.0: + + Add methods to get the active layout symbols and group + (lp#65626) + + Add python error exit in getKbd (lp#526791) + + Fix potential X resource leaks + + Add test code to simulate missing X keyboard + + Some code cleanup + + Reorganize source directory and add AUTHORS, NEWS and README files + + Add MANIFEST.in file + + Use pkg-config to find paths instead of hardcoded paths + + Update license to LGPL 3 + + Use 'python-virtkey' name also for source package + + Change version format to major.minor.micro + + Add some API documentation +- Change License tag from GPLv2+ to LGPLv3+. +- Drop python-virtkey-use-pkg-config.patch: fixed upstream. +- Update description + ------------------------------------------------------------------- Mon Dec 20 09:02:23 UTC 2010 - saschpe@suse.de diff --git a/python-virtkey.spec b/python-virtkey.spec index 4ff3adb..ffec034 100644 --- a/python-virtkey.spec +++ b/python-virtkey.spec @@ -11,26 +11,25 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define mod_name virtkey Name: python-%{mod_name} -Version: 0.50 -Release: 0 -Url: https://launchpad.net/virtkey +Version: 0.60.0 +Release: 1 +Url: https://launchpad.net/virtkey Summary: Python extension to emulate keypresses -License: GPLv2+ +License: LGPLv3+ Group: Development/Languages/Python -Source: python-%{mod_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM python-virtkey-use-pkg-config.patch vuntz@opensuse.org -- Fix build by using pkg-config to get compilation flags, sent by mail upstream (no bug tracker) -Patch0: python-virtkey-use-pkg-config.patch +Source: python-%{mod_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: glib2-devel @@ -40,16 +39,12 @@ BuildRequires: gtk2-devel %endif %description -Python extension for emulating keypresses and getting current keyboard layout. - -Authors: --------- - Chris Jones +python-virtkey is a python extension for emulating keypresses and +getting the keyboard geometry from the xserver. %prep export CFLAGS="%{optflags}" -%setup -c -%patch0 -p1 +%setup -q %build python setup.py build @@ -62,6 +57,7 @@ rm -rf %{buildroot} %files %{?suse_version: -f INSTALLED_FILES} %defattr(-,root,root,-) +%doc AUTHORS COPYING.LESSER NEWS README %if 0%{!?suse_version:1} %python_sitelib/%{mod_name}* %endif