X-Git-Url: http://git.pld-linux.org/?p=packages%2Feog.git;a=blobdiff_plain;f=eog.spec;h=69369f935e2286fea506053c4b7d0eb5963bb686;hp=2a6e868472c7cdf7b8969d38d6fe5de0790d6ff1;hb=HEAD;hpb=85b65f0b06c51effa72fcb4e8e678aec90ea1ea4

diff --git a/eog.spec b/eog.spec
index 2a6e868..c85f578 100644
--- a/eog.spec
+++ b/eog.spec
@@ -1,61 +1,71 @@
 #
 # Conditional build:
-%bcond_without	apidocs		# disable API documentation
-#
+%bcond_without	apidocs	# API documentation
+%bcond_without	librsvg	# SVG scaling using librsvg
+
 Summary:	The Eye of GNOME image viewer
 Summary(pl.UTF-8):	Oko GNOME - przeglądarka obrazków
 Summary(pt_BR.UTF-8):	Visualizador de imagem Eye of GNOME
 Name:		eog
-Version:	2.24.0
+Version:	45.3
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/eog/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	9a8cb17555df81980ac0492715a195e3
-Patch0:		%{name}-codegen.patch
-URL:		http://www.gnome.org/projects/eog/
-BuildRequires:	GConf2-devel >= 2.24.0
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.74
+Source0:	https://download.gnome.org/sources/eog/45/%{name}-%{version}.tar.xz
+# Source0-md5:	d70e1f25805f8d4af9223ca747c5eac3
+Patch0:		%{name}-no-update.patch
+URL:		https://wiki.gnome.org/Apps/EyeOfGnome
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	exempi-devel >= 1.99.5
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 2.24.0
-BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-icon-theme >= 2.24.0
-BuildRequires:	gnome-vfs2-devel >= 2.24.0
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
-BuildRequires:	gtk+2-devel >= 2:2.14.0
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	lcms-devel
-BuildRequires:	libart_lgpl-devel >= 2.3.19
+BuildRequires:	gdk-pixbuf2-devel >= 2.36.5
+BuildRequires:	gettext-tools >= 0.19.7
+BuildRequires:	glib2-devel >= 1:2.73.2
+BuildRequires:	gnome-desktop-devel >= 3.2.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 42
+BuildRequires:	gtk+3-devel >= 3.24.15
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.16}
+BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libexif-devel >= 1:0.6.14
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.24.0
-BuildRequires:	libjpeg-devel
-BuildRequires:	libtool
-BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	libhandy1-devel >= 1.5.0
+BuildRequires:	libjpeg-turbo-devel
+BuildRequires:	libpeas-devel >= 1.0.0
+BuildRequires:	libpeas-gtk-devel >= 1.0.0
+BuildRequires:	libportal-devel >= 0.5
+BuildRequires:	libportal-gtk3-devel >= 0.5
+%{?with_librsvg:BuildRequires:	librsvg-devel >= 2.44.0}
+BuildRequires:	meson >= 0.58.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pkgconfig >= 1:0.9.0
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
-BuildRequires:	sed >= 4.0
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	shared-mime-info >= 0.50
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+BuildRequires:	zlib-devel
+Requires(post,postun):	glib2 >= 1:2.73.2
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
-Requires:	libgnomeui >= 2.24.0
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	exempi >= 1.99.5
+Requires:	gdk-pixbuf2 >= 2.36.5
+Requires:	glib2 >= 1:2.73.2
+Requires:	gsettings-desktop-schemas >= 3.4.0
+Requires:	gtk+3 >= 3.24.15
+Requires:	hicolor-icon-theme
+Requires:	libexif >= 1:0.6.14
+Requires:	libhandy1 >= 1.5.0
+%{?with_rsvg:Requires:	librsvg >= 2.44.0}
+Requires:	shared-mime-info >= 0.50
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Eye of GNOME is a tool for viewing/cataloging images.
 
 %description -l pl.UTF-8
-Eye of GNOME (Oko GNOME) jest narzędziem do oglądania/katalogowania
+Eye of GNOME (Oko GNOME) jest narzędziem do oglądania i katalogowania
 obrazków.
 
 %description -l pt_BR.UTF-8
@@ -66,11 +76,7 @@ Summary:	Header files for eog
 Summary(pl.UTF-8):	Pliki nagłówkowe eog
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.24.0
-Requires:	gnome-vfs2-devel >= 2.24.0
-Requires:	gtk+2-devel >= 2:2.14.0
-Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnomeui-devel >= 2.24.0
+Requires:	gtk+3-devel >= 3.24.15
 
 %description devel
 Header files for eog.
@@ -83,6 +89,7 @@ Summary:	Eye of GNOME API documentation
 Summary(pl.UTF-8):	Dokumentacja API Eye of GNOME
 Group:		Documentation
 Requires:	gtk-doc-common
+BuildArch:	noarch
 
 %description apidocs
 Eye of GNOME API documentation.
@@ -95,70 +102,64 @@ Dokumentacja API Eye of GNOME.
 %patch0 -p1
 
 %build
-%{?with_apidocs:%{__gtkdocize}}
-%{__gnome_doc_common}
-%{__libtoolize}
-%{__intltoolize}
-%{__aclocal}
-%{__automake}
-%{__autoheader}
-%{__autoconf}
-%configure \
-	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
-	--disable-schemas-install \
-	--disable-scrollkeeper \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	-Dgtk_doc=%{?with_apidocs:true}%{!?with_apidocs:false} \
+	%{!?with_librsvg:-Dlibrsvg=false}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/eog/plugins
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+%ninja_install -C build
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
+# not supported by glibc (as of 2.37)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install eog.schemas
-%scrollkeeper_update_post
 %update_desktop_database_post
 %update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall eog.schemas
+%glib_compile_schemas
 
 %postun
-%scrollkeeper_update_postun
 %update_desktop_database_postun
 %update_icon_cache hicolor
+%glib_compile_schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%doc AUTHORS ChangeLog NEWS README.md THANKS TODO
 %attr(755,root,root) %{_bindir}/eog
-%{_sysconfdir}/gconf/schemas/eog.schemas
-%{_datadir}/%{name}
-%{_desktopdir}/eog.desktop
 %dir %{_libdir}/eog
+%dir %{_libdir}/eog/girepository-1.0
+%{_libdir}/eog/girepository-1.0/Eog-3.0.typelib
 %dir %{_libdir}/eog/plugins
-# buggy soname generation, uses .so.0.0.0
-%{_libdir}/eog/plugins/fullscreen.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/libeog.so
+%{_libdir}/eog/plugins/fullscreen.plugin
 %attr(755,root,root) %{_libdir}/eog/plugins/libfullscreen.so*
-%{_libdir}/eog/plugins/reload.eog-plugin
+%{_libdir}/eog/plugins/reload.plugin
 %attr(755,root,root) %{_libdir}/eog/plugins/libreload.so*
-%{_libdir}/eog/plugins/statusbar-date.eog-plugin
+%{_libdir}/eog/plugins/statusbar-date.plugin
 %attr(755,root,root) %{_libdir}/eog/plugins/libstatusbar-date.so*
-%{_iconsdir}/hicolor/*/*/*
+%{_datadir}/%{name}
+%{_datadir}/GConf/gsettings/eog.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.gschema.xml
+%{_datadir}/metainfo/eog.appdata.xml
+%{_desktopdir}/org.gnome.eog.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.eog.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.eog.Devel.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.eog-symbolic.svg
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/eog-2.20
+%{_includedir}/eog-3.0
 %{_pkgconfigdir}/eog.pc
 
 %if %{with apidocs}