- merged from DEVEL

Changed files:
    eog.spec -> 1.117

diff --git a/eog.spec b/eog.spec
index 6496d389de45d369c51e309bdfa7b17f4bad5b06..2a6e868472c7cdf7b8969d38d6fe5de0790d6ff1 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -1,34 +1,38 @@
+#
+# 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.22.3
-Release:       2
+Version:       2.24.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/eog/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: f1ca295b0ebf800cab17fc166e37588e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/eog/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: 9a8cb17555df81980ac0492715a195e3
 Patch0:                %{name}-codegen.patch
-Patch1:                %{name}-desktop.patch
 URL:           http://www.gnome.org/projects/eog/
-BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: exempi-devel >= 1.99.5
 BuildRequires: gettext-devel
-BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gnome-desktop-devel >= 2.22.0
-BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-icon-theme >= 2.20.0
-BuildRequires: gnome-vfs2-devel >= 2.22.0
-BuildRequires: gtk+2-devel >= 2:2.12.5
-BuildRequires: intltool >= 0.37.0
+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: libexif-devel >= 1:0.6.14
 BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.22.0
+BuildRequires: libgnomeui-devel >= 2.24.0
 BuildRequires: libjpeg-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.9.0
@@ -36,13 +40,13 @@ BuildRequires:      rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
 BuildRequires: sed >= 4.0
-BuildRequires: shared-mime-info >= 0.20
+BuildRequires: shared-mime-info >= 0.50
 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.22.0
+Requires:      libgnomeui >= 2.24.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,11 +66,11 @@ 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.22.0
-Requires:      gnome-vfs2-devel >= 2.22.0
-Requires:      gtk+2-devel >= 2:2.12.5
+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.22.0
+Requires:      libgnomeui-devel >= 2.24.0
 
 %description devel
 Header files for eog.
@@ -74,15 +78,24 @@ Header files for eog.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe eog.
 
+%package apidocs
+Summary:       Eye of GNOME API documentation
+Summary(pl.UTF-8):     Dokumentacja API Eye of GNOME
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+Eye of GNOME API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Eye of GNOME.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-%{__sed} -i -e "s#sr@Latn#sr@latin#" po/LINGUAS
-mv po/sr@{Latn,latin}.po
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
@@ -91,8 +104,10 @@ mv po/sr@{Latn,latin}.po
 %{__autoheader}
 %{__autoconf}
 %configure \
+       --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
        --disable-schemas-install \
-       --disable-scrollkeeper
+       --disable-scrollkeeper \
+       --with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -102,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
+
 %find_lang %{name} --with-gnome --with-omf
 
 %clean
@@ -128,9 +145,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/eog.schemas
 %{_datadir}/%{name}
 %{_desktopdir}/eog.desktop
+%dir %{_libdir}/eog
+%dir %{_libdir}/eog/plugins
+# buggy soname generation, uses .so.0.0.0
+%{_libdir}/eog/plugins/fullscreen.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libfullscreen.so*
+%{_libdir}/eog/plugins/reload.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libreload.so*
+%{_libdir}/eog/plugins/statusbar-date.eog-plugin
+%attr(755,root,root) %{_libdir}/eog/plugins/libstatusbar-date.so*
 %{_iconsdir}/hicolor/*/*/*
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/eog-2.20
 %{_pkgconfigdir}/eog.pc
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/eog
+%endif