- updated to 3.0.0; merged from DEVEL

Changed files:
    evince.spec -> 1.120

diff --git a/evince.spec b/evince.spec
index 2813ec6876a14a4c4279d3af4b55d8f700012fef..ad4cb6458ade457396c4a07fc4dabed373961763 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -10,58 +10,57 @@
 Summary:       Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
 Name:          evince
-Version:       2.32.0
-Release:       6
+Version:       3.0.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Graphics
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: ebc3ce6df8dcbf29cb9492f8dd031319
-Patch0:                %{name}-poppler.patch
-Patch1:                %{name}-secfix.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 9d8fdb4a2be479001e06fdc6fe81e7e7
 URL:           http://www.gnome.org/projects/evince/
-BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.10
 BuildRequires: cairo-devel >= 1.10.0
-%{?with_dbus:BuildRequires:    dbus-glib-devel >= 0.74}
 BuildRequires: djvulibre-devel >= 3.5.17
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-doc-utils >= 0.14.0
-BuildRequires: gnome-icon-theme >= 2.26.0
-BuildRequires: gtk+2-devel >= 2:2.22.0
+BuildRequires: gnome-icon-theme >= 3.0.0
+BuildRequires: gobject-introspection-devel >= 0.6.0
+BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: gtk+3-devel >= 3.0.0
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.13}
 BuildRequires: intltool >= 0.40.0
 BuildRequires: kpathsea-devel
 BuildRequires: libgnome-keyring-devel >= 2.26.0
+#BuildRequires:        libgxps-devel >= 0.0.1
 BuildRequires: libspectre-devel >= 0.2.0
 BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: nautilus-devel >= 2.26.0
+BuildRequires: nautilus-devel >= 3.0.0
 BuildRequires: pkgconfig
-BuildRequires: poppler-glib-devel >= 0.14.0
+BuildRequires: poppler-glib-devel >= 0.16.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.592
-BuildRequires: scrollkeeper
 BuildRequires: t1lib-devel
+BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
 BuildRequires: zlib-devel
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): glib2 >= 1:2.26.0
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): scrollkeeper
-Requires(post,preun):  GConf2
 Requires:      dconf
-Requires:      gtk+2 >= 2:2.22.0
+Requires:      gnome-icon-theme >= 3.0.0
+Requires:      gsettings-desktop-schemas
+Requires:      gtk+3 >= 3.0.0
+Requires:      gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 Suggests:      evince-backend-djvu
 Suggests:      evince-backend-dvi
 Suggests:      evince-backend-pdf
 Suggests:      evince-backend-ps
-Suggests:      gtk+2-cups
+Suggests:      gtk+3-cups
 Conflicts:     evince-gtk
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -86,7 +85,7 @@ Summary:      Header files for Evince
 Summary(pl.UTF-8):     Pliki nagłówkowe Evince
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk+2-devel >= 2:2.22.0
+Requires:      gtk+3-devel >= 3.0.0
 
 %description devel
 Header files for Evince.
@@ -111,7 +110,7 @@ Summary:    Evince extension for Nautilus
 Summary(pl.UTF-8):     Rozszerzenie Evince dla Nautilusa
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      nautilus >= 2.26.0
+Requires:      nautilus >= 3.0.0
 
 %description -n nautilus-extension-evince
 Shows Evince document properties in Nautilus.
@@ -122,7 +121,6 @@ Pokazuje właściwości dokumentu Evince w Nautilusie.
 %package backend-djvu
 Summary:       View DJVu documents with Evince
 Group:         X11/Applications
-Requires(post,preun):  GConf2
 Requires:      %{name} = %{version}-%{release}
 Requires:      djvulibre >= 3.5.17
 
@@ -132,7 +130,6 @@ View DJVu documents with Evince.
 %package backend-dvi
 Summary:       View DVI documents with Evince
 Group:         X11/Applications
-Requires(post,preun):  GConf2
 Requires:      %{name} = %{version}-%{release}
 
 %description backend-dvi
@@ -141,9 +138,8 @@ View DVI documents with Evince.
 %package backend-pdf
 Summary:       View PDF documents with Evince
 Group:         X11/Applications
-Requires(post,preun):  GConf2
 Requires:      %{name} = %{version}-%{release}
-Requires:      poppler-glib >= 0.14.0
+Requires:      poppler-glib >= 0.16.0
 
 %description backend-pdf
 View PDF documents with Evince.
@@ -151,7 +147,6 @@ View PDF documents with Evince.
 %package backend-ps
 Summary:       View Postscript documents with Evince
 Group:         X11/Applications
-Requires(post,preun):  GConf2
 Requires:      %{name} = %{version}-%{release}
 
 %description backend-ps
@@ -159,8 +154,6 @@ View Postscript documents with Evince.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -173,17 +166,15 @@ View Postscript documents with Evince.
 %configure \
        %{?with_apidocs:--enable-gtk-doc} \
        --disable-static \
-       --disable-schemas-install \
        --disable-silent-rules \
        --enable-comics \
        --enable-djvu \
        --enable-dvi \
-       --enable-impress \
        --enable-t1lib \
        --enable-nautilus \
        --enable-pdf \
-       --enable-pixbuf \
        --enable-tiff \
+       --with-smclient=xsmp \
        --with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -193,8 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{backendsdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{backendsdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -203,93 +195,58 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%gconf_schema_install evince-thumbnailer-comics.schemas
-%gconf_schema_install evince-thumbnailer.schemas
 %update_desktop_database_post
-%scrollkeeper_update_post
 %update_icon_cache hicolor
 %glib_compile_schemas
 
-%preun
-%gconf_schema_uninstall evince-thumbnailer-comics.schemas
-%gconf_schema_uninstall evince-thumbnailer.schemas
-
 %postun
 /sbin/ldconfig
 %update_desktop_database_postun
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
 %glib_compile_schemas
 
-%post backend-djvu
-%gconf_schema_install evince-thumbnailer-djvu.schemas
-
-%preun backend-djvu
-%gconf_schema_uninstall evince-thumbnailer-djvu.schemas
-
-%post backend-dvi
-%gconf_schema_install evince-thumbnailer-dvi.schemas
-
-%preun backend-dvi
-%gconf_schema_uninstall evince-thumbnailer-dvi.schemas
-
-%post backend-ps
-%gconf_schema_install evince-thumbnailer-ps.schemas
-
-%preun backend-ps
-%gconf_schema_uninstall evince-thumbnailer-ps.schemas
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %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.3
-%attr(755,root,root) %{_libdir}/libevview.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevview.so.3
+%attr(755,root,root) %{_libdir}/libevdocument3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libevdocument3.so.3
+%attr(755,root,root) %{_libdir}/libevview3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libevview3.so.3
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/3
 %dir %{backendsdir}
 %attr(755,root,root) %{backendsdir}/libcomicsdocument.so
 %{backendsdir}/comicsdocument.evince-backend
-%attr(755,root,root) %{backendsdir}/libimpressdocument.so
-%{backendsdir}/impressdocument.evince-backend
-%attr(755,root,root) %{backendsdir}/libpixbufdocument.so
-%{backendsdir}/pixbufdocument.evince-backend
 %attr(755,root,root) %{backendsdir}/libtiffdocument.so
 %{backendsdir}/tiffdocument.evince-backend
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
 %{_datadir}/GConf/gsettings/evince.convert
 %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
 %{_datadir}/%{name}
+%dir %{_datadir}/thumbnailers
+%{_datadir}/thumbnailers/evince.thumbnailer
 %{_mandir}/man1/evince.1*
 %{_desktopdir}/evince.desktop
 %{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
 
 %files backend-djvu
 %defattr(644,root,root,755)
 %attr(755,root,root) %{backendsdir}/libdjvudocument.so
 %{backendsdir}/djvudocument.evince-backend
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer-djvu.schemas
 
 %files backend-dvi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{backendsdir}/libdvidocument.so
 %{backendsdir}/dvidocument.evince-backend
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas
 
 %files backend-ps
 %defattr(644,root,root,755)
 %attr(755,root,root) %{backendsdir}/libpsdocument.so
 %{backendsdir}/psdocument.evince-backend
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
 
 %files backend-pdf
 %defattr(644,root,root,755)
@@ -298,10 +255,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libevdocument.so
-%attr(755,root,root) %{_libdir}/libevview.so
-%{_libdir}/libevdocument.la
-%{_libdir}/libevview.la
+%attr(755,root,root) %{_libdir}/libevdocument3.so
+%attr(755,root,root) %{_libdir}/libevview3.so
 %{_includedir}/evince
 %{_pkgconfigdir}/evince-document-*.pc
 %{_pkgconfigdir}/evince-view-*.pc
@@ -316,4 +271,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n nautilus-extension-evince
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so