From cf12797b98ffb2171e6a6a564e5c6e210f5f5520774ba459e51b9b0b0178b8a9 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 31 Aug 2017 22:49:42 +0000 Subject: [PATCH] Accepting request 520056 from devel:languages:python:singlespec-staging - singlespec auto-conversion - Add pre_checkin.sh and rework python3 packaging so that only updating the python-virtkey spec file is enough: the few differences between the two spec files are handled with a %build_for_python3 define. - Initial python3 support. - Update to version 0.63.0: + Add support for system-layout specific items in Onboard's layout files - Changes from version 0.62.0: + Allow arbitrary sequence of modifier masks - Changes from version 0.61.0: + Add support for python3 + Reduce the number of unnecessarily linked libraries + Make XkbGetKeyboard use correct constants + Switch the name of the source code package back to virtkey - Cleanup the spec file a bit: drop non-openSUSE packaging bits. - Add pkgconfig(xkbfile) BuildRequires: new dependency ypstream. - Add explicit pkgconfig(x11) and pkgconfig(xtst) BuildRequires: those are needed after the xorg-x11 packaging change. - Change glib2-devel and gtk2-devel BuildRequires to the real pkgconfig() dependencies for this package: gdk-2.0 and glib-2.0. - 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 - Re-packaged with py2pack to reduce build errors - New package. OBS-URL: https://build.opensuse.org/request/show/520056 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtkey?expand=0&rev=13 --- python-virtkey.changes | 6 ++++++ python-virtkey.spec | 41 +++++++++++++++++------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/python-virtkey.changes b/python-virtkey.changes index 63f21e5..18ed184 100644 --- a/python-virtkey.changes +++ b/python-virtkey.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 24 13:57:00 UTC 2017 - jmatejek@suse.com + +- singlespec auto-conversion + ------------------------------------------------------------------- Tue Jan 15 08:57:57 UTC 2013 - vuntz@suse.com @@ -66,3 +71,4 @@ Fri Apr 2 03:21:38 CEST 2010 - vuntz@opensuse.org - New package. + diff --git a/python-virtkey.spec b/python-virtkey.spec index c72e5c6..33ef699 100644 --- a/python-virtkey.spec +++ b/python-virtkey.spec @@ -1,7 +1,7 @@ # # spec file for package python-virtkey # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,54 +16,47 @@ # -%define mod_name virtkey -%define build_for_python3 0 - -%if %{build_for_python3} -%define local_python python3 -%else -%define local_python python -%endif - -Name: python-%{mod_name} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +Name: python-virtkey Version: 0.63.0 +%define major 0.63 Release: 0 -Url: https://launchpad.net/virtkey Summary: Python extension to emulate keypresses License: LGPL-3.0+ Group: Development/Languages/Python -Source: %{mod_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: https://launchpad.net/virtkey +Source: https://launchpad.net/virtkey/%{major}/%{version}/+download/virtkey-%{version}.tar.gz +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: glib2-devel BuildRequires: gtk2-devel -%if %{build_for_python3} -BuildRequires: python3-devel -BuildRequires: python3-distribute -%else -BuildRequires: python-devel -%endif +BuildRequires: pkgconfig +BuildRequires: python-rpm-macros BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xtst) +%python_subpackages %description python-virtkey is a python extension for emulating keypresses and getting the keyboard geometry from the xserver. %prep -%setup -q -n %{mod_name}-%{version} +%setup -q -n virtkey-%{version} %build export CFLAGS="%{optflags}" -%{local_python} setup.py build +%python_build %install -%{local_python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +%python_install -%files -f INSTALLED_FILES +%files %{python_files} %defattr(-,root,root,-) %doc AUTHORS COPYING.LESSER NEWS README +%{python_sitearch}/virtkey*.so +%{python_sitearch}/virtkey-%{version}-py*.egg-info %changelog