- updated to 42.0; uses meson now

- hide-titlebar plugin is gone
- postr plugin is disabled in this version (not ported to meson, unmaintained and not working)

diff --git a/eog-plugins-configure.patch b/eog-plugins-configure.patch
deleted file mode 100644 (file)
index dcb632f..0000000
--- a/eog-plugins-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- eog-plugins-3.0.0/configure.ac.configure   2011-04-23 14:37:47.643094161 +0200
-+++ eog-plugins-3.0.0/configure.ac     2011-04-23 14:38:24.049563598 +0200
-@@ -223,14 +223,6 @@ done
- # Postr 
- # *****
- plugin_defined postr
--if test "$?" = 1
--then
--      AC_PATH_PROG(POSTR, postr)
--      if test -z "$POSTR"
--      then
--              undef_plugin postr "postr was not found"
--      fi
--fi
- 
- # *******
- # Postasa

diff --git a/eog-plugins.spec b/eog-plugins.spec
index 87aef8573bb3668f8c827d243c731e7a0b9b3f3a..a04fa2b1c1cef69e476947a04f2420283e88004f 100644 (file)
--- a/eog-plugins.spec
+++ b/eog-plugins.spec
@@ -1,46 +1,50 @@
+#
+# Conditional build
+%bcond_with    postr   # flickr uploader plugin (no longer working as of 42)
+
 Summary:       A collection of plugins for the EOG image viewer
 Summary(pl.UTF-8):     Zestaw wtyczek do przeglądarki obrazków EOG
 Name:          eog-plugins
-Version:       3.26.8
+Version:       42.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/eog-plugins/3.26/%{name}-%{version}.tar.xz
-# Source0-md5: 54dd0b8841abccb0023f72b0969505ef
-Patch0:                %{name}-configure.patch
+Source0:       https://download.gnome.org/sources/eog-plugins/42/%{name}-%{version}.tar.xz
+# Source0-md5: f9339a924365ef22078ce7083cceaabb
 URL:           https://wiki.gnome.org/Apps/EyeOfGnome
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.11
 BuildRequires: clutter-devel >= 1.9.4
 BuildRequires: clutter-gtk-devel >= 1.1.2
-BuildRequires: eog-devel >= 3.16.0
+BuildRequires: eog-devel >= 41.0
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.38.0
+BuildRequires: glib2-devel >= 1:2.53.4
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gtk+3-devel >= 3.14.0
 BuildRequires: libchamplain-devel >= 0.12.0
 BuildRequires: libexif-devel >= 1:0.6.16
 BuildRequires: libgdata-devel >= 0.9.1
-BuildRequires: libpeas-devel >= 1.0.0
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libpeas-devel >= 1.14.1
+BuildRequires: libpeas-gtk-devel >= 1.14.1
+BuildRequires: meson >= 0.58.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: python3-devel >= 1:3.2
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.38.0
+Requires(post,postun): glib2 >= 1:2.53.4
 Requires:      clutter >= 1.9.4
 Requires:      clutter-gtk >= 1.1.2
-Requires:      eog >= 3.16.0
-Requires:      glib2 >= 1:2.38.0
+Requires:      eog >= 41.0
+Requires:      glib2 >= 1:2.53.4
 Requires:      gtk+3 >= 3.14.0
 Requires:      libchamplain >= 0.12.0
 Requires:      libexif >= 1:0.6.16
 Requires:      libgdata >= 0.9.1
-Suggests:      libpeas-gtk >= 1.0.0
-Suggests:      libpeas-loader-python
-Suggests:      postr
+Requires:      libpeas >= 1.14.1
+Requires:      libpeas-gtk >= 1.14.1
+Suggests:      libpeas-loader-python >= 1.14.1
+%{?with_postr:Suggests:        postr}
 Suggests:      python-pygobject3 >= 3.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,27 +60,17 @@ GNOME (Oko GNOME).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       POSTR=/usr/bin/postr \
-       --disable-silent-rules
-%{__make}
+%meson build \
+       %{?with_postr:-Dplugin_postr=true}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{pluginsdir}/*.{la,py}
-%{__rm} $RPM_BUILD_ROOT%{pluginsdir}/pythonconsole/*.py
+%ninja_install -C build
 
 %find_lang eog-plugins
 
@@ -91,69 +85,61 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f eog-plugins.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.export-to-folder.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.fullscreenbg.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.pythonconsole.gschema.xml
-
-%{_datadir}/appdata/eog-exif-display.metainfo.xml
-%{_datadir}/appdata/eog-export-to-folder.metainfo.xml
-%{_datadir}/appdata/eog-fit-to-width.metainfo.xml
-%{_datadir}/appdata/eog-fullscreenbg.metainfo.xml
-%{_datadir}/appdata/eog-hide-titlebar.metainfo.xml
-%{_datadir}/appdata/eog-light-theme.metainfo.xml
-%{_datadir}/appdata/eog-map.metainfo.xml
-%{_datadir}/appdata/eog-maximize-windows.metainfo.xml
-%{_datadir}/appdata/eog-postasa.metainfo.xml
-%{_datadir}/appdata/eog-postr.metainfo.xml
-%{_datadir}/appdata/eog-pythonconsole.metainfo.xml
-%{_datadir}/appdata/eog-send-by-mail.metainfo.xml
-%{_datadir}/appdata/eog-slideshowshuffle.metainfo.xml
-
-%dir %{pluginsdir}/__pycache__
+%doc AUTHORS MAINTAINERS NEWS README
 
-%attr(755,root,root) %{pluginsdir}/libexif-display.so
 %{pluginsdir}/exif-display.plugin
+%attr(755,root,root) %{pluginsdir}/libexif-display.so
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
+%{_datadir}/metainfo/eog-exif-display.appdata.xml
+
+%{pluginsdir}/export-to-folder.plugin
+%{pluginsdir}/export-to-folder.py
+%{_datadir}/eog/plugins/export-to-folder
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.export-to-folder.gschema.xml
+%{_datadir}/metainfo/eog-export-to-folder.appdata.xml
 
-%attr(755,root,root) %{pluginsdir}/libfit-to-width.so
 %{pluginsdir}/fit-to-width.plugin
+%attr(755,root,root) %{pluginsdir}/libfit-to-width.so
+%{_datadir}/metainfo/eog-fit-to-width.appdata.xml
 
-%dir %{_datadir}/eog/plugins/fullscreenbg
 %{pluginsdir}/fullscreenbg.plugin
-%{pluginsdir}/__pycache__/fullscreenbg*.pyc
-%{_datadir}/eog/plugins/fullscreenbg/preferences_dialog.ui
+%{pluginsdir}/fullscreenbg.py
+%{_datadir}/eog/plugins/fullscreenbg
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.fullscreenbg.gschema.xml
+%{_datadir}/metainfo/eog-fullscreenbg.appdata.xml
+
+%{pluginsdir}/light-theme.plugin
+%attr(755,root,root) %{pluginsdir}/liblight-theme.so
+%{_datadir}/metainfo/eog-light-theme.appdata.xml
 
-%attr(755,root,root) %{pluginsdir}/libmap.so
 %{pluginsdir}/map.plugin
+%attr(755,root,root) %{pluginsdir}/libmap.so
+%{_datadir}/metainfo/eog-map.appdata.xml
 
-%attr(755,root,root) %{pluginsdir}/libpostr.so
-%{pluginsdir}/postr.plugin
+%{pluginsdir}/maximize-windows.plugin
+%{pluginsdir}/maximize-windows.py
+%{_datadir}/metainfo/eog-maximize-windows.appdata.xml
 
-%attr(755,root,root) %{pluginsdir}/libpostasa.so
 %{pluginsdir}/postasa.plugin
+%attr(755,root,root) %{pluginsdir}/libpostasa.so
+%{_datadir}/metainfo/eog-postasa.appdata.xml
 
-%{pluginsdir}/maximize-windows.plugin
-%{pluginsdir}/__pycache__/maximize-windows*.pyc
+%if %{with postr}
+%{pluginsdir}/postr.plugin
+%attr(755,root,root) %{pluginsdir}/libpostr.so
+%{_datadir}/metainfo/eog-postr.appdata.xml
+%endif
 
-%{pluginsdir}/pythonconsole
 %{pluginsdir}/pythonconsole.plugin
-%dir %{_datadir}/eog/plugins/pythonconsole
-%{_datadir}/eog/plugins/pythonconsole/config.ui
+%{pluginsdir}/pythonconsole
+%{_datadir}/eog/plugins/pythonconsole
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.pythonconsole.gschema.xml
+%{_datadir}/metainfo/eog-pythonconsole.appdata.xml
 
-%attr(755,root,root) %{pluginsdir}/libsend-by-mail.so
 %{pluginsdir}/send-by-mail.plugin
+%attr(755,root,root) %{pluginsdir}/libsend-by-mail.so
+%{_datadir}/metainfo/eog-send-by-mail.appdata.xml
 
 %{pluginsdir}/slideshowshuffle.plugin
-%{pluginsdir}/__pycache__/slideshowshuffle*.pyc
-
-%dir %{_datadir}/eog/plugins/export-to-folder
-%{pluginsdir}/export-to-folder.plugin
-%{pluginsdir}/__pycache__/export-to-folder*.pyc
-%{_datadir}/eog/plugins/export-to-folder/preferences_dialog.ui
-
-%attr(755,root,root) %{pluginsdir}/libhide-titlebar.so
-%{pluginsdir}/hide-titlebar.plugin
-
-%attr(755,root,root) %{pluginsdir}/liblight-theme.so
-%{pluginsdir}/light-theme.plugin
+%{pluginsdir}/slideshowshuffle.py
+%{_datadir}/metainfo/eog-slideshowshuffle.appdata.xml