- updated dependencies, added missing pl, added nautilus bcond, cleanup

diff --git a/evince.spec b/evince.spec
index cd5d889220bd738e8f65d8bd9bd27abc2412d597..4fca8c098fe3dc87f49ac87b5c48f514f2fb65fd 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -4,8 +4,8 @@
 #   for same application?
 #
 # Conditional build:
-%bcond_without dbus            # disable DBUS support
 %bcond_without apidocs         # disable gtk-doc
+%bcond_without nautilus        # Nautilus extensions
 
 Summary:       Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
@@ -27,7 +27,7 @@ BuildRequires:        gettext-devel
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-icon-theme >= 3.2.0
-BuildRequires: gobject-introspection-devel >= 0.6.0
+BuildRequires: gobject-introspection-devel >= 1.0
 BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gtk+3-devel >= 3.8.0
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.13}
@@ -37,9 +37,10 @@ BuildRequires:       libgxps-devel >= 0.2.1
 BuildRequires: libsecret-devel >= 0.5
 BuildRequires: libspectre-devel >= 0.2.0
 BuildRequires: libtiff-devel
-BuildRequires: libtool >= 2.2
+BuildRequires: libtool >= 2:2.2
 BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: nautilus-devel >= 3.0.0
+BuildRequires: libxml2-progs >= 1:2.6.31
+%{?with_nautilus:BuildRequires:        nautilus-devel >= 3.0.0}
 BuildRequires: pkgconfig
 BuildRequires: poppler-glib-devel >= 0.24.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
@@ -47,12 +48,14 @@ BuildRequires:      rpmbuild(macros) >= 1.592
 BuildRequires: t1lib-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libICE-devel
-BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libSM-devel >= 1.0.0
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 BuildRequires: yelp-tools
 BuildRequires: zlib-devel
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): glib2 >= 1:2.36.0
+Requires:      cairo >= 1.10.0
 Requires:      dconf
 Requires:      glib2 >= 1:2.36.0
 Requires:      gnome-icon-theme >= 3.2.0
@@ -60,6 +63,8 @@ Requires:     gsettings-desktop-schemas
 Requires:      gtk+3 >= 3.8.0
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
+Requires:      libsecret >= 0.5
+Requires:      xorg-lib-libSM >= 1.0.0
 Suggests:      evince-backend-djvu
 Suggests:      evince-backend-dvi
 Suggests:      evince-backend-pdf
@@ -117,44 +122,76 @@ Requires: %{name} = %{version}-%{release}
 Requires:      nautilus >= 3.0.0
 
 %description -n nautilus-extension-evince
-Shows Evince document properties in Nautilus.
+This extension shows Evince document properties in Nautilus.
 
 %description -n nautilus-extension-evince -l pl.UTF-8
-Pokazuje właściwości dokumentu Evince w Nautilusie.
+To rozszerzenie pokazuje właściwości dokumentu Evince w Nautilusie.
 
 %package backend-djvu
-Summary:       View DJVu documents with Evince
+Summary:       View DjVu documents with Evince
+Summary(pl.UTF-8):     Przeglądanie dokumentów DjVu przy użyciu Evince
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      djvulibre >= 3.5.17
 
 %description backend-djvu
-View DJVu documents with Evince.
+View DjVu documents with Evince.
+
+%description backend-djvu -l pl.UTF-8
+Przeglądanie dokumentów DjVu przy użyciu Evince.
 
 %package backend-dvi
 Summary:       View DVI documents with Evince
+Summary(pl.UTF-8):     Przeglądanie dokumentów DVI przy użyciu Evince
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Requires:      libspectre >= 0.2.0
 
 %description backend-dvi
 View DVI documents with Evince.
 
+%description backend-dvi -l pl.UTF-8
+Przeglądanie dokumentów DVI przy użyciu Evince.
+
 %package backend-pdf
 Summary:       View PDF documents with Evince
+Summary(pl.UTF-8):     Przeglądanie dokumentów PDF przy użyciu Evince
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      poppler-glib >= 0.20.0
+Requires:      libxml2 >= 1:2.6.31
+Requires:      poppler-glib >= 0.24.0
 
 %description backend-pdf
 View PDF documents with Evince.
 
+%description backend-pdf -l pl.UTF-8
+Przeglądanie dokumentów PDF przy użyciu Evince.
+
 %package backend-ps
-Summary:       View Postscript documents with Evince
+Summary:       View PostScript documents with Evince
+Summary(pl.UTF-8):     Przeglądanie dokumentów PostScript przy użyciu Evince
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Requires:      libspectre >= 0.2.0
 
 %description backend-ps
-View Postscript documents with Evince.
+View PostScript documents with Evince.
+
+%description backend-ps -l pl.UTF-8
+Przeglądanie dokumentów PostScript przy użyciu Evince.
+
+%package backend-xps
+Summary:       View XPS documents with Evince
+Summary(pl.UTF-8):     Przeglądanie dokumentów XPS przy użyciu Evince
+Group:         X11/Applications
+Requires:      %{name} = %{version}-%{release}
+Requires:      libgxps >= 0.2.1
+
+%description backend-xps
+View XPS documents with Evince.
+
+%description backend-xps -l pl.UTF-8
+Przeglądanie dokumentów XPS przy użyciu Evince.
 
 %prep
 %setup -q
@@ -169,19 +206,19 @@ View Postscript documents with Evince.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{?with_apidocs:--enable-gtk-doc} \
-       --disable-static \
-       --disable-silent-rules \
        --enable-comics \
        --enable-djvu \
        --enable-dvi \
+       %{?with_apidocs:--enable-gtk-doc} \
        --enable-introspection \
-       --enable-t1lib \
-       --enable-nautilus \
+       --enable-nautilus%{!?with_nautilus:=no} \
        --enable-pdf \
+       --disable-silent-rules \
+       --disable-static \
+       --enable-t1lib \
        --enable-tiff \
-       --with-smclient=xsmp \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+       --with-smclient=xsmp
 %{__make}
 
 %install
@@ -192,7 +229,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{backendsdir}/*.la
+%if %{with nautilus}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
+%endif
 
 %find_lang %{name} --with-gnome
 
@@ -222,6 +261,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libevdocument3.so.4
 %attr(755,root,root) %{_libdir}/libevview3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libevview3.so.3
+%{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib
+%{_libdir}/girepository-1.0/EvinceView-3.0.typelib
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/4
 %dir %{backendsdir}
@@ -229,8 +270,6 @@ rm -rf $RPM_BUILD_ROOT
 %{backendsdir}/comicsdocument.evince-backend
 %attr(755,root,root) %{backendsdir}/libtiffdocument.so
 %{backendsdir}/tiffdocument.evince-backend
-%attr(755,root,root) %{backendsdir}/libxpsdocument.so
-%{backendsdir}/xpsdocument.evince-backend
 %{_datadir}/GConf/gsettings/evince.convert
 %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
@@ -239,8 +278,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/evince.1*
 %{_desktopdir}/evince.desktop
 %{_desktopdir}/evince-previewer.desktop
-%{_iconsdir}/hicolor/*/*/*.png
-%{_libdir}/girepository-1.0/*.typelib
+%{_iconsdir}/hicolor/*x*/apps/evince.png
 
 %files backend-djvu
 %defattr(644,root,root,755)
@@ -262,23 +300,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{backendsdir}/libpdfdocument.so
 %{backendsdir}/pdfdocument.evince-backend
 
+%files backend-xps
+%defattr(644,root,root,755)
+%attr(755,root,root) %{backendsdir}/libxpsdocument.so
+%{backendsdir}/xpsdocument.evince-backend
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libevdocument3.so
 %attr(755,root,root) %{_libdir}/libevview3.so
+%{_datadir}/gir-1.0/EvinceDocument-3.0.gir
+%{_datadir}/gir-1.0/EvinceView-3.0.gir
 %{_includedir}/evince
-%{_pkgconfigdir}/evince-document-*.pc
-%{_pkgconfigdir}/evince-view-*.pc
-%{_datadir}/gir-1.0/*.gir
+%{_pkgconfigdir}/evince-document-3.0.pc
+%{_pkgconfigdir}/evince-view-3.0.pc
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/evince
-%{_gtkdocdir}/libevdocument-*
-%{_gtkdocdir}/libevview-*
+%{_gtkdocdir}/libevdocument-3.0
+%{_gtkdocdir}/libevview-3.0
 %endif
 
+%if %{with nautilus}
 %files -n nautilus-extension-evince
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
+%endif