From 171f62d0de4f233a39a51d453f3531940dd65a64 Mon Sep 17 00:00:00 2001
From: mkasik <mkasik@fedoraproject.org>
Date: Apr 01 2010 15:56:54 +0000
Subject: - Update scriptlets

- Make build verbose
- Update required versions of libraries (Marek Kasik)

---

diff --git a/evince.spec b/evince.spec
index 921a252..17a8cc5 100644
--- a/evince.spec
+++ b/evince.spec
@@ -1,12 +1,12 @@
-%define poppler_version 0.10.1
-%define glib2_version 2.15.0
-%define gtk2_version 2.9.4
-%define dbus_version 0.60
-%define theme_version 2.17.1
+%global poppler_version 0.12.0
+%global glib2_version 2.18.0
+%global gtk2_version 2.14.0
+%global dbus_version 0.70
+%global theme_version 2.17.1
 
 Name:           evince
 Version:        2.30.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -119,16 +119,15 @@ adds an additional tab called "Document" to the file properties dialog.
 %patch3 -p1 -b .deprecated
 
 %build
-%configure --disable-static --disable-scrollkeeper \
+%configure --disable-static --disable-scrollkeeper --disable-schemas-install \
         --enable-comics=yes \
         --enable-dvi=yes \
         --enable-djvu=yes \
         --enable-t1lib=yes
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --delete-original --vendor="" \
@@ -138,8 +137,6 @@ desktop-file-install --delete-original --vendor="" \
 
 %find_lang evince --with-gnome
 
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 # Get rid of static libs and .la files.
@@ -155,36 +152,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-        export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-        gconftool-2 --makefile-uninstall-rule \
-                %{_sysconfdir}/gconf/schemas/evince.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
-                        >/dev/null || :
-        if [ -f %{_sysconfdir}/gconf/schemas/evince-thumbnailer-djvu.schemas ]; then
-                gconftool-2 --makefile-uninstall-rule \
-                        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-djvu.schemas \
-                        >/dev/null || :
-        fi
-        if [ -f %{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas ]; then
-                gconftool-2 --makefile-uninstall-rule \
-                        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas \
-                        >/dev/null || :
-        fi
-fi
-
+%gconf_schema_prepare evince evince-thumbnailer evince-thumbnailer-ps
+%gconf_schema_prepare evince-thumbnailer-comics evince-thumbnailer-djvu
+%gconf_schema_prepare evince-thumbnailer-dvi
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/evince.schemas \
-        %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
-        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
-        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
-        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-djvu.schemas \
-        %{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas \
-                >/dev/null || :
+%gconf_schema_upgrade evince evince-thumbnailer evince-thumbnailer-ps
+%gconf_schema_upgrade evince-thumbnailer-comics evince-thumbnailer-djvu
+%gconf_schema_upgrade evince-thumbnailer-dvi
 
 update-desktop-database &> /dev/null ||:
 
@@ -193,18 +168,9 @@ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 %post libs -p /sbin/ldconfig
 
 %preun
-if [ "$1" -eq 0 ]; then
-        export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-        gconftool-2 --makefile-uninstall-rule \
-                %{_sysconfdir}/gconf/schemas/evince.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer-comics.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer-djvu.schemas \
-                %{_sysconfdir}/gconf/schemas/evince-thumbnailer-dvi.schemas \
-                        >/dev/null || :
-fi
-
+%gconf_schema_remove evince evince-thumbnailer evince-thumbnailer-ps
+%gconf_schema_remove evince-thumbnailer-comics evince-thumbnailer-djvu
+%gconf_schema_remove evince-thumbnailer-dvi
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -274,6 +240,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Thu Apr  1 2010 Christoph Wickert <cwickert@fedoraproject.org> - 2.30.0-4
+- Update scriptlets
+- Make build verbose
+- Update required versions of libraries (Marek Kasik)
+
 * Thu Apr  1 2010 Christoph Wickert <cwickert@fedoraproject.org> - 2.30.0-3
 - Split out libevince-properties-page.so into nautilus subpackage
 - Resolves: #578776