New version

- Drop Python 2 support (mkolman)

.gitignore

@@ -41,3 +41,4 @@ python-meh-0.13.tar.gz
 /python-meh-0.42.tar.gz
 /python-meh-0.43.tar.gz
 /python-meh-0.44.tar.gz
+/python-meh-0.46.tar.gz

python-meh.spec

@@ -1,13 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global libreportver 2.0.18-1
-%global with_python3 1
-
-%define libreportver 2.0.18-1
 
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: https://github.com/rhinstaller/python-meh
-Version: 0.44
+Version: 0.46
-Release: 8%{?dist}
+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.
@@ -17,65 +14,33 @@ Release: 8%{?dist}
 Source0: https://github.com/rhinstaller/python-meh/archive/%{name}-%{version}.tar.gz
 
 License: GPLv2+
-Group: System Environment/Libraries
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel
 BuildRequires: gettext
-BuildRequires: python-setuptools
 BuildRequires: intltool
-BuildRequires: dbus-python
 BuildRequires: libreport-gtk >= %{libreportver}
 BuildRequires: libreport-cli >= %{libreportver}
-BuildRequires: libreport-python >= %{libreportver}
-BuildRequires: python-six
 
-%if 0%{with_python3}
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-dbus
-BuildRequires: libreport-python3 >= %{libreportver}
+BuildRequires: python3-libreport >= %{libreportver}
-BuildRequires: python3-six
-%endif
 
 %global _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 \
 exceptions.
 
 %description %_description
 
-%package -n python2-meh
-Summary: %summary
-Requires: python
-Requires: dbus-python
-Requires: rpm-python
-Requires: libreport-cli >= %{libreportver}
-Requires: libreport-python >= %{libreportver}
-Requires: python-six
-%{?python_provide:%python_provide python2-meh}
-
-%description -n python2-meh %_description
-
-%package -n python2-meh-gui
-Summary: Graphical user interface for the python-meh library
-Requires: python-meh = %{version}-%{release}
-Requires: pygobject3
-Requires: gtk3
-Requires: libreport-gtk >= %{libreportver}
-%{?python_provide:%python_provide python2-meh-gui}
-
-%description -n python2-meh-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
+%{?python_provide:%python_provide python3-meh}
+Obsoletes: python-meh < 0.46-1
+Obsoletes: python2-meh < 0.46-1
 Requires: python3
 Requires: python3-dbus
-Requires: rpm-python3
+Requires: python3-rpm
 Requires: libreport-cli >= %{libreportver}
-Requires: libreport-python3 >= %{libreportver}
+Requires: python3-libreport >= %{libreportver}
-Requires: python3-six
 
 %description -n python3-meh
 The python3-meh package is a python 3 library for handling, saving, and reporting
@@ -83,6 +48,9 @@ exceptions.
 
 %package -n python3-meh-gui
 Summary: Graphical user interface for the python3-meh library
+%{?python_provide:%python_provide python3-meh-gui}
+Obsoletes: python-meh-gui < 0.46-1
+Obsoletes: python2-meh-gui < 0.46-1
 Requires: python3-meh = %{version}-%{release}
 Requires: python3-gobject, gtk3
 Requires: libreport-gtk >= %{libreportver}
@@ -90,91 +58,35 @@ 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
+%files -n python3-meh -f %{name}.lang
-rm -rf %{buildroot}
-
-%files -n python2-meh -f %{name}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING
-%{python_sitelib}/*
-%exclude %{python_sitelib}/meh/ui/gui.py*
-
-%files -n python2-meh-gui
-%{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*
+%exclude %{python3_sitelib}/meh/ui/
 
 %files -n python3-meh-gui
-%{python3_sitelib}/meh/ui/gui.py*
+%{python3_sitelib}/meh/ui/
 %{_datadir}/python-meh
 
 %changelog
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.44-8
+* Mon Feb 12 2018 Martin Kolman <mkolman@redhat.com> - 0.46-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+- Drop Python 2 support (mkolman)
 
-* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.44-7
+* Tue May 23 2017 Martin Kolman <mkolman@redhat.com> - 0.45-1
-- Also rename the gui subpackage to python2-meh-gui
+- update translations (mkolman)
-
-* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.44-6
-- Python 2 binary package renamed to python2-meh
-  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.44-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.44-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.44-3
-- Rebuild for Python 3.6
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.44-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
 * Fri Feb 19 2016 Martin Kolman <mkolman@redhat.com> - 0.44-1
 - Some rpmlint fixes (mkolman)

sources

@@ -1 +1 @@
-4ac8d25d8bad13f31bd878548ffea0c4  python-meh-0.44.tar.gz
+SHA512 (python-meh-0.46.tar.gz) = 67e273bf90fcabcafedabe78e027fdb251872f10b62a36168d082977686b2c70420c4ba0d957a44ff17663d2ad7db0482d5a6a1a2f0bf8ee278129d048c85fba