X-Git-Url: http://git.pld-linux.org/?p=packages%2Feom.git;a=blobdiff_plain;f=eom.spec;h=6fb0250b12acdb9abbd61999d76818048ef24d29;hp=394bd9a6435534fe913ecac4c610ab5e81bab256;hb=b120ded1e70eb2c838d644a0fcd0dd2736e39795;hpb=dd55a5d342bb2a3351903f1dbb44a98a347478b9

diff --git a/eom.spec b/eom.spec
index 394bd9a..6fb0250 100644
--- a/eom.spec
+++ b/eom.spec
@@ -1,41 +1,40 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable API documentation
-%bcond_with	gtk3		# use GTK+ 3.x instead of 2.x
 
 Summary:	The Eye of MATE image viewer
 Summary(pl.UTF-8):	Oko MATE - przeglądarka obrazków
 Summary(pt_BR.UTF-8):	Visualizador de imagem Eye of MATE
 Name:		eom
-Version:	1.10.5
+Version:	1.18.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://pub.mate-desktop.org/releases/1.10/%{name}-%{version}.tar.xz
-# Source0-md5:	362b5a94e363e3ef45fdb34c0335f18d
-Patch0:		%{name}-codegen.patch
+Source0:	http://pub.mate-desktop.org/releases/1.18/%{name}-%{version}.tar.xz
+# Source0-md5:	82e16e8543b1ed969ccc8ed481d812e3
 URL:		http://mate-desktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	exempi-devel >= 1.99.5
-BuildRequires:	gdk-pixbuf2-devel >= 2.4.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.30.0
 BuildRequires:	gettext-tools >= 0.10.40
-BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	glib2-devel >= 1:2.36.0
 BuildRequires:	gobject-introspection-devel >= 0.9.3
-%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.18.0}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
+BuildRequires:	gtk+3-devel >= 3.14
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.9}
-BuildRequires:	intltool >= 0.40.0
+BuildRequires:	intltool >= 0.50.1
 BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libexif-devel >= 1:0.6.14
 BuildRequires:	libjpeg-devel
+BuildRequires:	libpeas-devel >= 1.2.0
+BuildRequires:	libpeas-gtk-devel >= 1.2.0
 BuildRequires:	librsvg-devel >= 2.36.2
 BuildRequires:	libtool >= 1:1.4.3
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	mate-common
-BuildRequires:	mate-desktop-devel >= 1.9.1
+BuildRequires:	mate-desktop-devel >= 1.17.0
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	python-devel >= 1:2.3
 BuildRequires:	python-pygobject-devel >= 2.16.0
@@ -49,17 +48,19 @@ BuildRequires:	xz
 BuildRequires:	yelp-tools
 BuildRequires:	zlib-devel
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	glib2 >= 1:2.36.0
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
 Requires:	dbus-glib >= 0.71
 Requires:	exempi >= 1.99.5
-Requires:	glib2 >= 1:2.26.0
-%{!?with_gtk3:Requires:	gtk+2 >= 2:2.18.0}
-%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
+Requires:	gdk-pixbuf2 >= 2.30.0
+Requires:	glib2 >= 1:2.36.0
+Requires:	gtk+3 >= 3.14
 Requires:	libexif >= 1:0.6.14
+Requires:	libpeas >= 1.2.0
+Requires:	libpeas-gtk >= 1.2.0
 Requires:	librsvg >= 2.36.2
-Requires:	mate-desktop-libs >= 1.9.1
+Requires:	mate-desktop-libs >= 1.17.0
 Requires:	shared-mime-info >= 0.20
 Obsoletes:	mate-image-viewer
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,9 +81,8 @@ Summary:	Header files for Eye of MATE plugins
 Summary(pl.UTF-8):	Pliki nagłówkowe dla wtyczek Eye of MATE
 Group:		X11/Development/Libraries
 # doesn't require base
-Requires:	glib2-devel >= 1:2.26.0
-%{!?with_gtk3:Requires:	gtk+2-devel >= 2:2.18.0}
-%{?with_gtk3:Requires:	gtk+3-devel >= 3.0.0}
+Requires:	glib2-devel >= 1:2.36.0
+Requires:	gtk+3-devel >= 3.14
 Obsoletes:	mate-image-viewer-devel
 
 %description devel
@@ -109,7 +109,6 @@ Dokumentacja API Eye of MATE.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -122,7 +121,6 @@ Dokumentacja API Eye of MATE.
 %configure \
 	--enable-gtk-doc%{!?with_apidocs:=no} \
 	--disable-silent-rules \
-	%{?with_gtk:--with-gtk=3.0} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -134,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/eom/plugins/*.la
 
-# mate < 1.5 did not exist in PLD, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/eom.convert
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,ku_IQ,jv,pms}
 
 %find_lang eom --with-mate
 
@@ -154,17 +152,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f eom.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/eom
 %{_libdir}/girepository-1.0/Eom-1.0.typelib
 %dir %{_libdir}/eom
 %dir %{_libdir}/eom/plugins
 %attr(755,root,root) %{_libdir}/eom/plugins/libfullscreen.so
-%{_libdir}/eom/plugins/fullscreen.eom-plugin
+%{_libdir}/eom/plugins/fullscreen.plugin
 %attr(755,root,root) %{_libdir}/eom/plugins/libreload.so
-%{_libdir}/eom/plugins/reload.eom-plugin
+%{_libdir}/eom/plugins/reload.plugin
 %attr(755,root,root) %{_libdir}/eom/plugins/libstatusbar-date.so
-%{_libdir}/eom/plugins/statusbar-date.eom-plugin
+%{_libdir}/eom/plugins/statusbar-date.plugin
 %{_datadir}/appdata/eom.appdata.xml
 %{_datadir}/glib-2.0/schemas/org.mate.eom.enums.xml
 %{_datadir}/glib-2.0/schemas/org.mate.eom.gschema.xml