diff --git a/.gitignore b/.gitignore index 407bfb7..e7f7d36 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ rednotebook-1.1.0.tar.gz /rednotebook-1.12.tar.gz /rednotebook-1.13.tar.gz /rednotebook-1.14.tar.gz +/rednotebook-2.3.tar.gz diff --git a/rednotebook.spec b/rednotebook.spec index 68cfc63..3a3b51d 100644 --- a/rednotebook.spec +++ b/rednotebook.spec @@ -1,6 +1,6 @@ Name: rednotebook -Version: 1.14 -Release: 4%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: Daily journal with calendar, templates and keyword searching License: GPLv2+ @@ -8,15 +8,13 @@ URL: http://rednotebook.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools +BuildRequires: python3-devel BuildRequires: desktop-file-utils Requires: PyYAML -Requires: pygtk2 -Requires: pywebkitgtk -Requires: python-chardet -Requires: gnome-python2-extras +Requires: webkitgtk4 +Requires: python3-chardet +Requires: python3-enchant Requires: hicolor-icon-theme %description @@ -26,13 +24,13 @@ templates, spell check your notes, and export to plain text, HTML, Latex or PDF. %prep -%setup -q +%autosetup %build -%{__python2} setup.py build +%py3_build %install -%{__python2} setup.py install --skip-build --root %{buildroot} +%py3_install desktop-file-install \ --add-category="Calendar" \ --delete-original \ @@ -67,16 +65,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/rednotebook.svg %{_datadir}/appdata/rednotebook.appdata.xml # be careful to not list locales twice -%dir %{python_sitelib}/%{name}/ -%{python2_sitelib}/%{name}/*.py* -%{python2_sitelib}/%{name}/external/ -%{python2_sitelib}/%{name}/files/ -%{python2_sitelib}/%{name}/gui/ -%{python2_sitelib}/%{name}/images/ -%{python2_sitelib}/%{name}/util/ -%{python2_sitelib}/%{name}*.egg-info +%dir %{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}/*.py* +%{python3_sitelib}/%{name}/external/ +%{python3_sitelib}/%{name}/files/ +%{python3_sitelib}/%{name}/gui/ +%{python3_sitelib}/%{name}/images/ +%{python3_sitelib}/%{name}/util/ +%{python3_sitelib}/%{name}*.egg-info %changelog +* Fri Oct 13 2017 Fabian Affolter - 2.3-1 +- Update to latest upstream release 2.3 +- Fix requirements (rhbz#1498766, rhbz#1501182) + * Thu Jul 27 2017 Fedora Release Engineering - 1.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 8a6bda8..ccb2706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rednotebook-1.14.tar.gz) = d78c8996cd0959270da82ed8b8ea82c0c320e0db5c2cf11fba2b5fe5c73efb92b4b44d42344e679c5e274b4b2453883f81beeecf2884bb4da1774ea102610ec3 +SHA512 (rednotebook-2.3.tar.gz) = 0741b3b4f65dfcc3f7084377b224e89feee2adbdf9dc5b6f83eda7296803059e634366e1bfd720fee907f1faa701e17496fac2f0b0f194d91ccc883b9cc58f7c