- Update scriptlets

- Make build verbose
- Update required versions of libraries (Marek Kasik)
This commit is contained in:
mkasik 2010-04-01 15:56:54 +00:00
parent fd08c2d683
commit 171f62d0de

View File

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