From 78a6160ab1b969f67b3a26d0572142541ee2ec83 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Fri, 8 Dec 2006 00:53:17 +0000
Subject: [PATCH] - Update to 2.9.3 - Configure with scrollkeeper disabled. -
 Ship our own icons from gnome-icon-theme. - Add patch for RH bug #215695
 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing
 attachments). - Add patch for GNOME bug #350253 (ship our own icons). - Add
 patch for GNOME bug #382431 (implicit function declaration). - Revise patch
 for GNOME bug #360946 (improved "about" dialog). - Remove patch for GNOME bug
 #357970 (fixed upstream).

---
 .cvsignore     |  5 +++++
 evolution.spec | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources        |  5 +++++
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f49f19c..44e9f8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,6 @@
 evolution-2.9.3.tar.bz2
+evolution16.png
+evolution22.png
+evolution24.png
+evolution32.png
+evolution.svg
diff --git a/evolution.spec b/evolution.spec
index c44df76..16d1489 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -50,6 +50,11 @@ Summary: GNOME's next-generation groupware suite
 URL: http://www.gnome.org/projects/evolution/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: %{name}-%{version}.tar.bz2
+Source1: evolution16.png
+Source2: evolution22.png
+Source3: evolution24.png
+Source4: evolution32.png
+Source5: evolution.svg
 
 ### Patches ###
 
@@ -143,6 +148,15 @@ Patch37: evolution-2.9.2-optional-participant.patch
 # GNOME bug #382431
 Patch38: evolution-2.9.3-implicit-function-declaration.patch
 
+# RH bug #215695 / GNOME bug #383027
+Patch39: evolution-2.9.3-dont-assume-default-account.patch
+
+# RH bug #216537 / GNOME bug #383047
+Patch40: evolution-2.9.3-view-attachment-uri.patch
+
+# GNOME bug #350253
+Patch41: evolution-2.9.3-adopt-icons.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -283,11 +297,24 @@ Development files needed for building things which link against evolution.
 %patch36 -p1 -b .pilot-link-0.12
 %patch37 -p1 -b .optional-participant
 %patch38 -p1 -b .implicit-function-declaration
+%patch39 -p1 -b .dont-assume-default-account
+%patch40 -p1 -b .view-attachment-uri
+%patch41 -p1 -b .adopt-icons
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}
 
+# GNOME bug #350253
+cd art
+mkdir 16x16; cp %{SOURCE1} 16x16/evolution.png
+mkdir 22x22; cp %{SOURCE2} 22x22/evolution.png
+mkdir 24x24; cp %{SOURCE3} 24x24/evolution.png
+mkdir 32x32; cp %{SOURCE4} 32x32/evolution.png
+mkdir scalable; cp %{SOURCE5} scalable/evolution.svg
+rm about-box.png bcg.png evolution.png monkey-16.png
+cd -
+
 %build
 # define all of our flags, this is kind of ugly :(
 %if %{ldap_support}
@@ -366,6 +393,7 @@ intltoolize --force
 autoconf
 
 %configure \
+  --disable-scrollkeeper \
   --enable-gtk-doc \
   --enable-ipv6 \
   --enable-file-locking=fcntl --enable-dot-locking=no \
@@ -434,11 +462,11 @@ SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evol
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
 done
-scrollkeeper-update
+scrollkeeper-update -q
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update
+scrollkeeper-update -q
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -468,6 +496,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome/help/evolution
 %{_datadir}/omf/evolution
 
+# Icons:
+%{_datadir}/icons/hicolor/16x16/apps/evolution.png
+%{_datadir}/icons/hicolor/22x22/apps/evolution.png
+%{_datadir}/icons/hicolor/24x24/apps/evolution.png
+%{_datadir}/icons/hicolor/32x32/apps/evolution.png
+%{_datadir}/icons/hicolor/scalable/apps/evolution.svg
+
 # IDL files (should this be in devel subpackage?)
 %{_datadir}/idl/evolution-%{evo_major}
 
@@ -476,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/evolution
 %{_datadir}/evolution/%{evo_major}
 
-%{_datadir}/pixmaps/evolution-%{evo_major}.png
-
 # Bonobo components:
 %{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server
 %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server
@@ -685,9 +718,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Mon Dec 04 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-1.fc7
+* Thu Dec 07 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-1.fc7
 - Update to 2.9.3
+- Configure with scrollkeeper disabled.
+- Ship our own icons from gnome-icon-theme.
+- Add patch for RH bug #215695 (crashes w/o mail accounts).
+- Add patch for RH bug #216537 (viewing attachments).
+- Add patch for GNOME bug #350253 (ship our own icons).
 - Add patch for GNOME bug #382431 (implicit function declaration).
+- Revise patch for GNOME bug #360946 (improved "about" dialog).
 - Remove patch for GNOME bug #357970 (fixed upstream).
 
 * Tue Nov 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-3.fc7
diff --git a/sources b/sources
index c4635e7..ba8849a 100644
--- a/sources
+++ b/sources
@@ -1 +1,6 @@
 03c29ef09dbd1b04623f736cbd8e14a7  evolution-2.9.3.tar.bz2
+4737f9b111e5e4b2fccc9e9b464c4b01  evolution16.png
+de663fa442d61f53dc058dd20c77da8e  evolution22.png
+d33896d33b5db2201e051664e96b1100  evolution24.png
+2fa4ce12c94153aca9af465e1a1819c8  evolution32.png
+e85874e8d480a9c82bc155da396a54e4  evolution.svg