rpms/evince/F-13 evince.spec,1.181,1.182 sources,1.71,1.72

Matthias Clasen mclasen at fedoraproject.org
Mon Mar 29 21:11:21 UTC 2010 

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3656

Modified Files:
	evince.spec sources 
Log Message:
2.30.0



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-13/evince.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- evince.spec	11 Mar 2010 23:23:03 -0000	1.181
+++ evince.spec	29 Mar 2010 21:11:20 -0000	1.182
@@ -4,42 +4,42 @@
 %define dbus_version 0.60
 %define theme_version 2.17.1
 
-Name:		evince
-Version:	2.29.92
-Release:	1%{?dist}
-Summary:	Document viewer
-
-License:	GPLv2+ and GFDL
-Group:		Applications/Publishing
-URL:		http://projects.gnome.org/evince/
-Source0:	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Name:           evince
+Version:        2.30.0
+Release:        1%{?dist}
+Summary:        Document viewer
+
+License:        GPLv2+ and GFDL
+Group:          Applications/Publishing
+URL:            http://projects.gnome.org/evince/
+Source0:        http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=455759
-# Patch1:		duplex-copies.patch
+# Patch1:               duplex-copies.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
-Patch2:		evince-t1font-mapping.patch
-Patch3:		evince-deprecated-functions.patch
+Patch2:         evince-t1font-mapping.patch
+Patch3:         evince-deprecated-functions.patch
 
-BuildRequires:	gtk2-devel >= %{gtk2_version}
-BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:	poppler-glib-devel >= %{poppler_version}
-BuildRequires:	libXt-devel
-BuildRequires:	nautilus-devel
-BuildRequires:	gnome-keyring-devel
-BuildRequires:	libglade2-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	libspectre-devel
-BuildRequires:	gnome-doc-utils
-BuildRequires:	scrollkeeper
-BuildRequires:	dbus-glib-devel >= %{dbus_version}
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-BuildRequires:	gnome-icon-theme >= %{theme_version}
-BuildRequires:	libtool
-BuildRequires:	gtk-doc
-BuildRequires:	intltool
-BuildRequires:	GConf2-devel
-BuildRequires:	t1lib-devel
+BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  glib2-devel >= %{glib2_version}
+BuildRequires:  poppler-glib-devel >= %{poppler_version}
+BuildRequires:  libXt-devel
+BuildRequires:  nautilus-devel
+BuildRequires:  gnome-keyring-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libspectre-devel
+BuildRequires:  gnome-doc-utils
+BuildRequires:  scrollkeeper
+BuildRequires:  dbus-glib-devel >= %{dbus_version}
+BuildRequires:  gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gnome-icon-theme >= %{theme_version}
+BuildRequires:  libtool
+BuildRequires:  gtk-doc
+BuildRequires:  intltool
+BuildRequires:  GConf2-devel
+BuildRequires:  t1lib-devel
 
 # for the dvi backend
 BuildRequires: kpathsea-devel
@@ -51,9 +51,7 @@ Requires: GConf2
 
 Requires(pre): GConf2
 Requires(post): GConf2
-Requires(post): scrollkeeper
 Requires(preun): GConf2
-Requires(postun): scrollkeeper
 Requires: %{name}-libs = %{version}-%{release}
 
 %description
@@ -111,11 +109,11 @@ This package contains a backend to let e
 
 %build
 %configure --disable-static --disable-scrollkeeper \
-	--with-print=gtk \
-	--enable-comics=yes \
-	--enable-dvi=yes \
-	--enable-djvu=yes \
-	--enable-t1lib=yes
+        --with-print=gtk \
+        --enable-comics=yes \
+        --enable-dvi=yes \
+        --enable-djvu=yes \
+        --enable-t1lib=yes
 make %{?_smp_mflags}
 
 %install
@@ -148,69 +146,67 @@ 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
+        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
 
 
 %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 || :
+        %{_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 || :
 
 update-desktop-database &> /dev/null ||:
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
+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 || :
+        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
 
 
 %postun
 update-desktop-database &> /dev/null ||:
-scrollkeeper-update -q || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %postun libs -p /sbin/ldconfig
 
 %files -f evince.lang
@@ -246,14 +242,14 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/evince/
-%{_datadir}/gtk-doc/html/libevview-2.29
-%{_datadir}/gtk-doc/html/libevdocument-2.29
+%{_datadir}/gtk-doc/html/libevview-2.30
+%{_datadir}/gtk-doc/html/libevdocument-2.30
 %dir %{_includedir}/evince
-%{_includedir}/evince/2.29
+%{_includedir}/evince/2.30
 %{_libdir}/libevview.so
 %{_libdir}/libevdocument.so
-%{_libdir}/pkgconfig/evince-view-2.29.pc
-%{_libdir}/pkgconfig/evince-document-2.29.pc
+%{_libdir}/pkgconfig/evince-view-2.30.pc
+%{_libdir}/pkgconfig/evince-document-2.30.pc
 
 %files dvi
 %defattr(-,root,root,-)
@@ -266,6 +262,9 @@ fi
 %{_libdir}/evince/2/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Thu Mar 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.92-1
 - Update to 2.29.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-13/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	11 Mar 2010 23:23:03 -0000	1.71
+++ sources	29 Mar 2010 21:11:20 -0000	1.72
@@ -1 +1 @@
-8d8398caf457854f853ebb03ebe55d5a  evince-2.29.92.tar.bz2
+a55f1997891a64157286b6f6b00f8458  evince-2.30.0.tar.bz2

More information about the scm-commits mailing list