- updated to 2.30.0; merged changes from DEVEL

Changed files:
    evince.spec -> 1.104

diff --git a/evince.spec b/evince.spec
index 13bf8a95af6663133ca400b9b299569c31666569..2fa0157be08ea88b9c87149a2a6b4552ce697158 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -6,16 +6,16 @@
 Summary:       Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
 Name:          evince
-Version:       2.28.2
-Release:       3
+Version:       2.30.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: f8b9a1ee6fe8cd0a1b7a51ad4db96e59
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: a55f1997891a64157286b6f6b00f8458
 URL:           http://www.gnome.org/projects/evince/
 BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf >= 2.57
-BuildRequires: automake >= 1:1.9
+BuildRequires: automake >= 1:1.10
 %{?with_dbus:BuildRequires:    dbus-glib-devel >= 0.74}
 BuildRequires: djvulibre-devel >= 3.5.17
 BuildRequires: docbook-dtd412-xml
@@ -24,9 +24,9 @@ BuildRequires:        glib2-devel >= 1:2.20.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-doc-utils >= 0.14.0
 BuildRequires: gnome-icon-theme >= 2.26.0
-BuildRequires: gnome-keyring-devel >= 2.26.0
+BuildRequires: libgnome-keyring-devel >= 2.26.0
 BuildRequires: gtk+2-devel >= 2:2.16.0
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.9}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.13}
 BuildRequires: intltool >= 0.40.0
 BuildRequires: kpathsea-devel
 BuildRequires: libspectre-devel >= 0.2.0
@@ -35,7 +35,7 @@ BuildRequires:        libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: nautilus-devel >= 2.26.0
 BuildRequires: pkgconfig
-BuildRequires: poppler-glib-devel >= 0.11.0
+BuildRequires: poppler-glib-devel >= 0.12.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
@@ -48,13 +48,13 @@ Requires(post,postun):      scrollkeeper
 Requires(post,preun):  GConf2
 Requires:      djvulibre >= 3.5.17
 Requires:      gtk+2 >= 2:2.16.0
-Requires:      poppler-glib >= 0.8.0
+Requires:      poppler-glib >= 0.12.0
 Conflicts:     evince-gtk
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                backendsdir     %{_libdir}/evince/1/backends
+%define                backendsdir     %{_libdir}/evince/2/backends
 
 %description
 Evince is a document viewer for multiple document formats like pdf,
@@ -108,6 +108,8 @@ Pokazuje właściwości dokumentu Evince w Nautilusie.
 
 %prep
 %setup -q
+sed -i s#^en@shaw## po/LINGUAS
+rm po/en@shaw.po
 
 %build
 %{__gtkdocize}
@@ -121,6 +123,7 @@ Pokazuje właściwości dokumentu Evince w Nautilusie.
        %{?with_apidocs:--enable-gtk-doc} \
        --disable-static \
        --disable-schemas-install \
+       --disable-silent-rules \
        --enable-comics \
        --enable-djvu \
        --enable-dvi \
@@ -179,12 +182,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/evince
 %attr(755,root,root) %{_bindir}/evince-previewer
 %attr(755,root,root) %{_bindir}/evince-thumbnailer
+%attr(755,root,root) %{_libdir}/evince-convert-metadata
+%attr(755,root,root) %{_libdir}/evinced
 %attr(755,root,root) %{_libdir}/libevdocument.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevdocument.so.1
+%attr(755,root,root) %ghost %{_libdir}/libevdocument.so.2
 %attr(755,root,root) %{_libdir}/libevview.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevview.so.1
+%attr(755,root,root) %ghost %{_libdir}/libevview.so.2
 %dir %{_libdir}/evince
-%dir %{_libdir}/evince/1
+%dir %{_libdir}/evince/2
 %dir %{backendsdir}
 %attr(755,root,root) %{backendsdir}/libcomicsdocument.so
 %{backendsdir}/comicsdocument.evince-backend
@@ -208,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
+%{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/%{name}
 %{_mandir}/man1/evince.1*
 %{_desktopdir}/evince.desktop
@@ -228,8 +234,8 @@ rm -rf $RPM_BUILD_ROOT
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/evince
-%{_gtkdocdir}/libevdocument
-%{_gtkdocdir}/libevview
+%{_gtkdocdir}/libevdocument-*
+%{_gtkdocdir}/libevview-*
 %endif
 
 %files -n nautilus-extension-evince