diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..44e98aa --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +sed 's,build_for_python3 0,build_for_python3 1,;s,^\(Name: *\)python-,\1python3-,' python-virtkey.spec > python3-virtkey.spec +cp python-virtkey.changes python3-virtkey.changes diff --git a/python-virtkey.changes b/python-virtkey.changes index be3b7fe..63f21e5 100644 --- a/python-virtkey.changes +++ b/python-virtkey.changes @@ -1,15 +1,31 @@ +------------------------------------------------------------------- +Tue Jan 15 08:57:57 UTC 2013 - vuntz@suse.com + +- 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. + ------------------------------------------------------------------- Mon Jan 14 16:34:27 UTC 2013 - p.drouand@gmail.com -- Initial python3 support +- Initial python3 support. ------------------------------------------------------------------- Mon Jan 14 16:04:34 UTC 2013 - p.drouand@gmail.com -- Update to 0.63.0 version: - * Add support for system-layout specific items in Onboard's layout files -- Cleanup the specfile: it only build for Suse > 12.01 version actually -- Add BuildRequires: pkgconfig(xkbfile) now needed for building package +- 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. ------------------------------------------------------------------- Fri Feb 24 09:31:30 UTC 2012 - vuntz@opensuse.org diff --git a/python-virtkey.spec b/python-virtkey.spec index e5239a1..c72e5c6 100644 --- a/python-virtkey.spec +++ b/python-virtkey.spec @@ -15,7 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %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} Version: 0.63.0 @@ -28,13 +36,17 @@ Source: %{mod_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel BuildRequires: gtk2-devel +%if %{build_for_python3} +BuildRequires: python3-devel +BuildRequires: python3-distribute +%else BuildRequires: python-devel +%endif BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xtst) -%py_requires %description python-virtkey is a python extension for emulating keypresses and @@ -45,10 +57,10 @@ getting the keyboard geometry from the xserver. %build export CFLAGS="%{optflags}" -python setup.py build +%{local_python} setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +%{local_python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES %files -f INSTALLED_FILES %defattr(-,root,root,-) diff --git a/python3-virtkey.changes b/python3-virtkey.changes index 89e07db..63f21e5 100644 --- a/python3-virtkey.changes +++ b/python3-virtkey.changes @@ -1,5 +1,68 @@ ------------------------------------------------------------------- -Mon Jan 14 16:34:14 UTC 2013 - p.drouand@gmail.com +Tue Jan 15 08:57:57 UTC 2013 - vuntz@suse.com -- Initial python3 support +- 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. + +------------------------------------------------------------------- +Mon Jan 14 16:34:27 UTC 2013 - p.drouand@gmail.com + +- Initial python3 support. + +------------------------------------------------------------------- +Mon Jan 14 16:04:34 UTC 2013 - p.drouand@gmail.com + +- 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. + +------------------------------------------------------------------- +Fri Feb 24 09:31:30 UTC 2012 - vuntz@opensuse.org + +- 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. + +------------------------------------------------------------------- +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 + +- Re-packaged with py2pack to reduce build errors + +------------------------------------------------------------------- +Fri Apr 2 03:21:38 CEST 2010 - vuntz@opensuse.org + +- New package. diff --git a/python3-virtkey.spec b/python3-virtkey.spec index 310db42..6ef4f37 100644 --- a/python3-virtkey.spec +++ b/python3-virtkey.spec @@ -15,7 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define mod_name virtkey +%define build_for_python3 1 + +%if %{build_for_python3} +%define local_python python3 +%else +%define local_python python +%endif Name: python3-%{mod_name} Version: 0.63.0 @@ -28,13 +36,16 @@ Source: %{mod_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel BuildRequires: gtk2-devel -BuildRequires: python3 +%if %{build_for_python3} BuildRequires: python3-devel BuildRequires: python3-distribute +%else +BuildRequires: python-devel +%endif BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xtst) %description @@ -45,14 +56,14 @@ getting the keyboard geometry from the xserver. %setup -q -n %{mod_name}-%{version} %build -python3 setup.py build +export CFLAGS="%{optflags}" +%{local_python} setup.py build %install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +%{local_python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES -%files +%files -f INSTALLED_FILES %defattr(-,root,root,-) %doc AUTHORS COPYING.LESSER NEWS README -%{python3_sitelib}/* %changelog