diff --git a/pympress/__init__.py b/pympress/__init__.py index 3653f0a5..53d24218 100644 --- a/pympress/__init__.py +++ b/pympress/__init__.py @@ -26,7 +26,7 @@ # DON'T IMPORT ANYTHING HERE (OR YOU WILL BREAK setup.py) # -__version__ = '1.7.0b4' +__version__ = '1.7.0' __author__ = """2009, 2010 Thomas Jost 2015-2020 Cimbali 2016 Christoph Rath diff --git a/pympress/__main__.py b/pympress/__main__.py index 6748939f..6284a1c4 100644 --- a/pympress/__main__.py +++ b/pympress/__main__.py @@ -59,7 +59,7 @@ def uncaught_handler(*exc_info): try: - # python 2.7 does not have this + # python <3.6 does not have this ModuleNotFoundError except NameError: ModuleNotFoundError = ImportError diff --git a/pympress/share/locale/cs/LC_MESSAGES/pympress.po b/pympress/share/locale/cs/LC_MESSAGES/pympress.po index 281da02e..2e65e89e 100644 --- a/pympress/share/locale/cs/LC_MESSAGES/pympress.po +++ b/pympress/share/locale/cs/LC_MESSAGES/pympress.po @@ -1017,3 +1017,15 @@ msgstr "" msgid "notes" msgstr "" +#: +msgid "Highlighting" +msgstr "" + +#: +msgid "Layout to draw on the current slide" +msgstr "" + +#: +msgid "highlighting" +msgstr "" + diff --git a/pympress/share/locale/de/LC_MESSAGES/pympress.po b/pympress/share/locale/de/LC_MESSAGES/pympress.po index f114d2b6..551fa5a7 100644 --- a/pympress/share/locale/de/LC_MESSAGES/pympress.po +++ b/pympress/share/locale/de/LC_MESSAGES/pympress.po @@ -1017,3 +1017,15 @@ msgstr "" msgid "notes" msgstr "" +#: +msgid "Highlighting" +msgstr "" + +#: +msgid "Layout to draw on the current slide" +msgstr "" + +#: +msgid "highlighting" +msgstr "" + diff --git a/pympress/share/locale/es/LC_MESSAGES/pympress.po b/pympress/share/locale/es/LC_MESSAGES/pympress.po index aecb1424..9c3062b7 100644 --- a/pympress/share/locale/es/LC_MESSAGES/pympress.po +++ b/pympress/share/locale/es/LC_MESSAGES/pympress.po @@ -1017,3 +1017,15 @@ msgstr "" msgid "notes" msgstr "" +#: +msgid "Highlighting" +msgstr "" + +#: +msgid "Layout to draw on the current slide" +msgstr "" + +#: +msgid "highlighting" +msgstr "" + diff --git a/pympress/share/locale/fr/LC_MESSAGES/pympress.po b/pympress/share/locale/fr/LC_MESSAGES/pympress.po index d2532bfd..cc2a2d90 100644 --- a/pympress/share/locale/fr/LC_MESSAGES/pympress.po +++ b/pympress/share/locale/fr/LC_MESSAGES/pympress.po @@ -1017,3 +1017,15 @@ msgstr "Sans notes" msgid "notes" msgstr "" +#: +msgid "Highlighting" +msgstr "" + +#: +msgid "Layout to draw on the current slide" +msgstr "" + +#: +msgid "highlighting" +msgstr "" + diff --git a/pympress/share/locale/pl/LC_MESSAGES/pympress.po b/pympress/share/locale/pl/LC_MESSAGES/pympress.po index 4123513a..9141b38c 100644 --- a/pympress/share/locale/pl/LC_MESSAGES/pympress.po +++ b/pympress/share/locale/pl/LC_MESSAGES/pympress.po @@ -1022,3 +1022,15 @@ msgstr "" msgid "notes" msgstr "" +#: +msgid "Highlighting" +msgstr "" + +#: +msgid "Layout to draw on the current slide" +msgstr "" + +#: +msgid "highlighting" +msgstr "" + diff --git a/setup.cfg b/setup.cfg index d35b6ef9..adc38dc3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -121,19 +121,24 @@ statistics = true [pysrpm] flavour = pympress requires = - %%{py3_dist watchdog} - %%{!?typelib_deps:gtk3 gdk-pixbuf2 poppler-glib gobject-introspection} - %%{?typelib_deps:typelib(cairo) typelib(GLib) typelib(DBus) typelib(DBusGLib) typelib(GObject) typelib(Gdk) typelib(GdkPixbuf) typelib(Gio) typelib(Gtk) typelib(Poppler)} - %%{!?suse_version:python%%%%{python3_version}dist(pygobject)} + gtk3 gdk-pixbuf2 poppler-glib gobject-introspection gstreamer gstreamer-plugins-base gstreamer-plugins-good + %%{?typelib_deps:typelib(cairo) typelib(GLib) typelib(DBus) typelib(DBusGLib) typelib(GObject) typelib(Gdk) typelib(GdkPixbuf) typelib(Gio) typelib(Gtk) typelib(Poppler) typelib(Gst)} + %%{!?suse_version:python%%{python3_version}dist(pygobject)} %%{!?mga_version:python3-gobject} + %%{py3_dist watchdog} + +recommends = gstreamer-plugins-ugly gstreamer-plugins-bad [pysrpm.pympress] preamble = %%define normalize() %%(echo %%* | tr "[:upper:]_ " "[:lower:]--") - %%{?!py3_dist:%%define py3_dist() (python%%{{python3_version}}dist(%%{{normalize %%1}}) or python3-%%1)} - %%{?suse_version:%%define typelib_deps 1} - %%{?mga_version:%%define typelib_deps 1} + %%{{?!py3_dist:%%define py3_dist() (python%%{{python3_version}}dist(%%{{normalize %%1}}) or python3-%%1)}} + %%{{?suse_version:%%define typelib_deps 1}} + %%{{?mga_version:%%define typelib_deps 1}} ${base:preamble} + %%if %%{{?!rhel:8}}%%{{?rhel}} >= 8 + Recommends: ${recommends} + %%endif post = ${base:post} if [ $$1 -gt 1 ]; then