- updated to 2.24.0; merged changes from DEVEL

Changed files:
    evince.spec -> 1.85

diff --git a/evince.spec b/evince.spec
index 6b375e2eda81195497aa04b71518b767d5833f08..73c8f2051746f77a27361e1b5d27de43d4d85226 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -6,52 +6,47 @@
 Summary:       Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
 Name:          evince
-Version:       2.22.2
+Version:       2.24.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: 3661f901ab40cee44d5350a045a8bdb1
-Patch0:                %{name}-desktop.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: 7d0f9850b0f33267d3977532f027ac95
 URL:           http://www.gnome.org/projects/evince/
-BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.9
 %{?with_dbus:BuildRequires:    dbus-glib-devel >= 0.74}
 BuildRequires: djvulibre-devel >= 3.5.17
 BuildRequires: gettext-devel
-BuildRequires: ghostscript-devel
-BuildRequires: glib2-devel >= 1:2.16.3
-BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-icon-theme >= 2.22.0
-BuildRequires: gtk+2-devel >= 2:2.12.9
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-keyring-devel >= 2.24.0
+BuildRequires: gnome-icon-theme >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.9}
-BuildRequires: intltool >= 0.37.0
+BuildRequires: intltool >= 0.40.0
 BuildRequires: kpathsea-devel
 BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.22.1
 BuildRequires: libspectre-devel >= 0.2.0
 BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: nautilus-devel >= 2.22.0
+BuildRequires: nautilus-devel >= 2.24.0
 BuildRequires: pkgconfig
-BuildRequires: poppler-glib-devel >= 0.6
+BuildRequires: poppler-glib-devel >= 0.8.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
-BuildRequires: sed >= 4.0
 BuildRequires: t1lib-devel
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk+2
 Requires(post,postun): scrollkeeper
 Requires(post,preun):  GConf2
-Requires:      cairo >= 1.2.4
 Requires:      djvulibre >= 3.5.17
-Requires:      gtk+2 >= 2:2.12.9
-Requires:      libgnomeui >= 2.22.1
-Requires:      poppler-glib >= 0.6
+Requires:      gtk+2 >= 2:2.14.0
+Requires:      poppler-glib >= 0.8.0
 Conflicts:     evince-gtk
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -75,8 +70,7 @@ xpdf jedną prostą aplikacją.
 Summary:       Header files for Evince
 Summary(pl.UTF-8):     Pliki nagłówkowe Evince
 Group:         X11/Development/Libraries
-Requires:      glib2-devel >= 1:2.16.3
-Requires:      gtk+2-devel >= 2:2.12.9
+Requires:      gtk+2-devel >= 2:2.14.0
 
 %description devel
 Header files for Evince.
@@ -101,7 +95,7 @@ Summary:     Evince extension for Nautilus
 Summary(pl.UTF-8):     Rozszerzenie Evince dla Nautilusa
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      nautilus >= 2.22.0
+Requires:      nautilus >= 2.24.0
 
 %description -n nautilus-extension-evince
 Shows Evince document properties in Nautilus.
@@ -111,10 +105,6 @@ Pokazuje właściwości dokumentu Evince w Nautilusie.
 
 %prep
 %setup -q
-%patch0 -p1
-
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}