X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=eog.spec;h=f42579a10cf32ac8252cda8890c534db0dbd7779;hb=c55f079c2ff2b803e4dd3e9f58e0dbaf048019a1;hp=11f9daa44f91ab88325d49a5d891ee5835ed178a;hpb=c4ac352bc706ee58827ee43d4df7ef6fe6994daf;p=packages%2Feog.git

diff --git a/eog.spec b/eog.spec
index 11f9daa..f42579a 100644
--- a/eog.spec
+++ b/eog.spec
@@ -1,52 +1,59 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# disable API documentation
-#
+
 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.26.0
+Version:	3.20.5
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/eog/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5:	5d513046f80bc989e715243d8cee2825
-Patch0:		%{name}-codegen.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/eog/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	fc6e611074a71c05d1cedcfb35a3895b
 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
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	exempi-devel >= 1.99.5
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 2.26.0
-BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-icon-theme >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.16.0
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.9}
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	lcms-devel
-BuildRequires:	libart_lgpl-devel >= 2.3.19
+BuildRequires:	gdk-pixbuf2-devel >= 2.30.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.42.0
+BuildRequires:	gnome-common
+BuildRequires:	gnome-desktop-devel >= 3.2.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.4.0
+BuildRequires:	gtk+3-devel >= 3.20.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.16}
+BuildRequires:	intltool >= 0.50.1
+BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libexif-devel >= 1:0.6.14
 BuildRequires:	libjpeg-devel
-BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.7.0
-BuildRequires:	pkgconfig >= 0.9.0
-BuildRequires:	python-pygobject-devel >= 2.16.0
-BuildRequires:	python-pygtk-devel >= 2:2.14.0
+BuildRequires:	libpeas-gtk-devel >= 1.0.0
+BuildRequires:	librsvg-devel >= 2.36.2
+BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
-BuildRequires:	sed >= 4.0
 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.42.0
 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(post,postun):	gtk-update-icon-cache
+Requires:	exempi >= 1.99.5
+Requires:	gdk-pixbuf2 >= 2.30.0
+Requires:	glib2 >= 1:2.42.0
+Requires:	gsettings-desktop-schemas >= 3.4.0
+Requires:	gtk+3 >= 3.20.0
+Requires:	hicolor-icon-theme
+Requires:	libexif >= 1:0.6.14
+Requires:	librsvg >= 2.36.2
+Requires:	shared-mime-info >= 0.50
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,7 +62,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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,8 +73,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:	gtk+2-devel >= 2:2.16.0
+Requires:	gtk+3-devel >= 3.20.0
 
 %description devel
 Header files for eog.
@@ -80,6 +86,9 @@ Summary:	Eye of GNOME API documentation
 Summary(pl.UTF-8):	Dokumentacja API Eye of GNOME
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Eye of GNOME API documentation.
@@ -89,11 +98,9 @@ Dokumentacja API Eye of GNOME.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
-%{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
 %{__aclocal}
@@ -101,9 +108,9 @@ Dokumentacja API Eye of GNOME.
 %{__autoheader}
 %{__autoconf}
 %configure \
-	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
-	--disable-schemas-install \
-	--disable-scrollkeeper \
+	%{__enable_disable apidocs gtk-doc} \
+	--disable-schemas-compile \
+	--disable-silent-rules \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -111,51 +118,54 @@ Dokumentacja API Eye of GNOME.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/eog{/plugins,}/*.la
+install -d $RPM_BUILD_ROOT%{_datadir}/eog/plugins
 
-%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
 %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/*/*/*
+%{_iconsdir}/hicolor/*x*/apps/eog.png
+%{_iconsdir}/hicolor/scalable/apps/eog-symbolic.svg
+%{_datadir}/%{name}
+%{_datadir}/GConf/gsettings/eog.convert
+%{_datadir}/appdata/eog.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.eog.gschema.xml
+%{_desktopdir}/eog.desktop
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/eog-2.20
+%{_includedir}/eog-3.0
 %{_pkgconfigdir}/eog.pc
 
 %if %{with apidocs}