Merge branch 'f15'

Conflicts:
	.gitignore
	evince.spec
	sources

.gitignore

@@ -1,13 +1 @@
-evince-2.31.5.tar.bz2
+evince-3.0.0.tar.bz2
-evince-2.31.6.tar.bz2
-/evince-2.31.90.tar.bz2
-evince-2.31.92.tar.bz2
-/evince-2.32.0.tar.bz2
-/evince-2.91.0.tar.bz2
-/evince-2.91.1-f615894.tar.bz2
-/evince-2.91.2.tar.bz2
-/evince-2.91.3.tar.bz2
-/evince-2.91.4.tar.bz2
-/evince-2.91.5.tar.bz2
-/evince-2.91.6.tar.bz2
-/evince-2.91.90.tar.bz2

evince.spec

@@ -4,14 +4,14 @@
 %global theme_version 2.17.1
 
 Name:           evince
-Version:        2.91.90
+Version:        3.0.0
-Release:        2%{?dist}
+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.91/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
 
@@ -231,10 +231,24 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 
 %changelog
+* Mon Apr  4 2011 Matthias clasne <mclasen@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Fri Mar 25 2011 Matthias clasne <mclasen@redhat.com> - 2.91.93-1
+- Update to 2.91.93
+
+* Tue Mar 22 2011 Marek Kasik <mkasik@redhat.com> - 2.91.92-2
+- Bump release
+
+* Mon Mar 21 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
 * Sun Mar 13 2011 Marek Kasik <mkasik@redhat.com> - 2.91.90-2
-- Update to 2.91.90
 - Rebuild (poppler-0.16.3)
 
+* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.90-1
+- Update to 2.91.90
+
 * Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.6-3
 - Rebuild against newer gtk
 

sources

@@ -1 +1 @@
-ad5273fbb4639962605dce2854cdc36e  evince-2.91.90.tar.bz2
+9d8fdb4a2be479001e06fdc6fe81e7e7  evince-3.0.0.tar.bz2