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)
This commit is contained in:
parent
dc24ae98bd
commit
5f65548280
1
.gitignore
vendored
1
.gitignore
vendored
@ -30,3 +30,4 @@ python-meh-0.13.tar.gz
|
|||||||
/python-meh-0.30.tar.gz
|
/python-meh-0.30.tar.gz
|
||||||
/python-meh-0.31.tar.gz
|
/python-meh-0.31.tar.gz
|
||||||
/python-meh-0.32.tar.gz
|
/python-meh-0.32.tar.gz
|
||||||
|
/python-meh-0.34.tar.gz
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
%{!?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
|
%define libreportver 2.0.18-1
|
||||||
|
|
||||||
Summary: A python library for handling exceptions
|
Summary: A python library for handling exceptions
|
||||||
Name: python-meh
|
Name: python-meh
|
||||||
Url: http://git.fedorahosted.org/git/?p=python-meh.git
|
Url: http://git.fedorahosted.org/git/?p=python-meh.git
|
||||||
Version: 0.32
|
Version: 0.34
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
# This is a Red Hat maintained package which is specific to
|
# This is a Red Hat maintained package which is specific to
|
||||||
# our distribution. Thus the source is only available from
|
# our distribution. Thus the source is only available from
|
||||||
# within this srpm.
|
# within this srpm.
|
||||||
@ -20,10 +21,18 @@ Group: System Environment/Libraries
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: python-devel, gettext, python-setuptools, intltool
|
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: python, dbus-python
|
||||||
Requires: openssh-clients, rpm-python, yum
|
Requires: openssh-clients, rpm-python
|
||||||
Requires: libreport-cli >= %{libreportver}
|
Requires: libreport-cli >= %{libreportver}
|
||||||
|
Requires: libreport-python >= %{libreportver}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The python-meh package is a python library for handling, saving, and reporting
|
The python-meh package is a python library for handling, saving, and reporting
|
||||||
@ -38,18 +47,66 @@ Requires: libreport-gtk >= %{libreportver}
|
|||||||
%description gui
|
%description gui
|
||||||
The python-meh-gui package provides a GUI for the python-meh library.
|
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
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
%if 0%{?with_python3}
|
||||||
|
rm -rf %{py3dir}
|
||||||
|
cp -a . %{py3dir}
|
||||||
|
%endif # with_python3
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make
|
make
|
||||||
|
|
||||||
|
%if 0%{?with_python3}
|
||||||
|
pushd %{py3dir}
|
||||||
|
make PYTHON=%{__python3}
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make test
|
make test
|
||||||
|
|
||||||
|
%if 0%{?with_python3}
|
||||||
|
pushd %{py3dir}
|
||||||
|
# Needs UTF-8 locale
|
||||||
|
LANG=en_US.UTF-8 make PYTHON=%{__python3} test
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
|
%if 0%{?with_python3}
|
||||||
|
pushd %{py3dir}
|
||||||
|
make PYTHON=%{__python3} DESTDIR=%{buildroot} install
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -65,7 +122,29 @@ rm -rf %{buildroot}
|
|||||||
%{python_sitelib}/meh/ui/gui.py*
|
%{python_sitelib}/meh/ui/gui.py*
|
||||||
%{_datadir}/python-meh
|
%{_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
|
%changelog
|
||||||
|
* Tue Dec 09 2014 Vratislav Podzimek <vpodzime@redhat.com> - 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 <vpodzime@redhat.com> - 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 <toshio@fedoraproject.org> - 0.32-3
|
* Mon Jun 30 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 0.32-3
|
||||||
- Replace pyhton-setuptools-devel BR with python-setuptools
|
- Replace pyhton-setuptools-devel BR with python-setuptools
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user