From 5f65548280410f1143ae32e9638d125b38d5f0d0 Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Tue, 9 Dec 2014 09:15:05 +0100 Subject: [PATCH] New version - Encode str/unicode object before hashing it (vpodzime) - Use dict.items() instead of dict.iteritems() (vpodzime) - Add one more flag to test (for Python3) (vpodzime) - Make sure we work with strings when we think we do (vpodzime) - Make sure fresh translations are always fetched (vpodzime) - Add pieces needed to build the python3- subpackage (#985294) (mhroncok) - Remove yum from requires and fix setuptools requires (mhroncok) - raw_input is replaced by input in Python3 (vpodzime) - Raise exception in a Python3 compatible way (mhroncok) --- .gitignore | 1 + python-meh.spec | 87 ++++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6f3f118..5beaad6 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ python-meh-0.13.tar.gz /python-meh-0.30.tar.gz /python-meh-0.31.tar.gz /python-meh-0.32.tar.gz +/python-meh-0.34.tar.gz diff --git a/python-meh.spec b/python-meh.spec index b950093..1c3102a 100644 --- a/python-meh.spec +++ b/python-meh.spec @@ -1,12 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%global with_python3 1 %define libreportver 2.0.18-1 Summary: A python library for handling exceptions Name: python-meh Url: http://git.fedorahosted.org/git/?p=python-meh.git -Version: 0.32 -Release: 3%{?dist} +Version: 0.34 +Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -20,10 +21,18 @@ Group: System Environment/Libraries BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, gettext, python-setuptools, intltool -BuildRequires: dbus-python, libreport-gtk >= %{libreportver}, libreport-cli >= %{libreportver} +BuildRequires: dbus-python, libreport-gtk >= %{libreportver}, libreport-cli >= %{libreportver}, libreport-python >= %{libreportver} + +%if 0%{with_python3} +BuildRequires: python3-devel python3-setuptools +BuildRequires: python3-dbus +BuildRequires: libreport-python3 >= %{libreportver} +%endif + Requires: python, dbus-python -Requires: openssh-clients, rpm-python, yum +Requires: openssh-clients, rpm-python Requires: libreport-cli >= %{libreportver} +Requires: libreport-python >= %{libreportver} %description The python-meh package is a python library for handling, saving, and reporting @@ -38,18 +47,66 @@ Requires: libreport-gtk >= %{libreportver} %description gui The python-meh-gui package provides a GUI for the python-meh library. +%if 0%{with_python3} +%package -n python3-meh +Summary: A python 3 library for handling exceptions +Requires: python3, python3-dbus +Requires: openssh-clients, rpm-python3 +Requires: libreport-cli >= %{libreportver} +Requires: libreport-python3 >= %{libreportver} + +%description -n python3-meh +The python3-meh package is a python 3 library for handling, saving, and reporting +exceptions. + +%package -n python3-meh-gui +Summary: Graphical user interface for the python3-meh library +Requires: python3-meh = %{version}-%{release} +Requires: python3-gobject, gtk3 +Requires: libreport-gtk >= %{libreportver} + +%description -n python3-meh-gui +The python3-meh-gui package provides a GUI for the python3-meh library. + +%endif + %prep %setup -q +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif # with_python3 + %build make +%if 0%{?with_python3} +pushd %{py3dir} +make PYTHON=%{__python3} +popd +%endif + %check make test +%if 0%{?with_python3} +pushd %{py3dir} +# Needs UTF-8 locale +LANG=en_US.UTF-8 make PYTHON=%{__python3} test +popd +%endif + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install + +%if 0%{?with_python3} +pushd %{py3dir} +make PYTHON=%{__python3} DESTDIR=%{buildroot} install +popd +%endif + %find_lang %{name} %clean @@ -65,7 +122,29 @@ rm -rf %{buildroot} %{python_sitelib}/meh/ui/gui.py* %{_datadir}/python-meh +%files -n python3-meh +%doc ChangeLog COPYING +%{python3_sitelib}/* +%exclude %{python3_sitelib}/meh/ui/gui.py* + +%files -n python3-meh-gui +%{python3_sitelib}/meh/ui/gui.py* +%{_datadir}/python-meh + %changelog +* Tue Dec 09 2014 Vratislav Podzimek - 0.34-1 +- Encode str/unicode object before hashing it (vpodzime) +- Use dict.items() instead of dict.iteritems() (vpodzime) +- Add one more flag to test (for Python3) (vpodzime) +- Make sure we work with strings when we think we do (vpodzime) + +* Fri Dec 05 2014 Vratislav Podzimek - 0.33-1 +- Make sure fresh translations are always fetched (vpodzime) +- Add pieces needed to build the python3- subpackage (#985294) (mhroncok) +- Remove yum from requires and fix setuptools requires (mhroncok) +- raw_input is replaced by input in Python3 (vpodzime) +- Raise exception in a Python3 compatible way (mhroncok) + * Mon Jun 30 2014 Toshio Kuratomi - 0.32-3 - Replace pyhton-setuptools-devel BR with python-setuptools diff --git a/sources b/sources index 5280885..b044841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0e3103b26f7ad05640d80f23f35e6a5 python-meh-0.32.tar.gz +bf9135d61e98e32c5a0fd287be7cfc6f python-meh-0.34.tar.gz