From f7a860fe4bfaa77e3a3573d1a19330a93af8ec28 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Oct 26 2005 21:46:35 +0000
Subject: - Added a patch (110) to hide the component switcher buttons by default on

    new windows (#170799) by patching the GConf schema.
- Made list of installed schemas explicit.
- Own the plugins subdirectory

---

diff --git a/evolution-2.4.1-hide-switcher-buttons-by-default.patch b/evolution-2.4.1-hide-switcher-buttons-by-default.patch
new file mode 100644
index 0000000..bada5b5
--- /dev/null
+++ b/evolution-2.4.1-hide-switcher-buttons-by-default.patch
@@ -0,0 +1,11 @@
+--- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default	2005-10-26 16:21:15.000000000 -0400
++++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in	2005-10-26 16:21:22.000000000 -0400
+@@ -99,7 +99,7 @@
+       <applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
+       <owner>evolution</owner>
+       <type>bool</type>
+-      <default>TRUE</default>
++      <default>FALSE</default>
+       <locale name="C">
+         <short>Window buttons are visible</short>
+         <long>Whether the window buttons should be visible.</long>
diff --git a/evolution.spec b/evolution.spec
index 3d8abb8..aace341 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@
 
 Name: evolution
 Version: 2.4.1
-Release: 6
+Release: 7
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -63,6 +63,9 @@ Patch108: evolution-2.3.5.1-fix-150458.patch
 # Fix for RH bug 164957 (was for 145552):
 Patch109: evolution-2.0.2-fix-145552.patch
 
+# Part of RH bug 170799:
+Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
+
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
 #Patch200: evolution-1.4.5-imap-command-length.patch
@@ -196,6 +199,8 @@ cd widgets/table
 cd ../..
 %patch109 -p1 -b .fix-164957
 
+%patch110 -p1 -b .hide-switcher-buttons-by-default
+
 #patch200 -p1 -b .commandlength
 
 #patch500 -p0 -b .wombatsm
@@ -336,7 +341,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{evo_major}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.4.schemas 
+%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-2.4.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-2.4.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_shell-2.4.schemas
+%{_sysconfdir}/gconf/schemas/evolution-mail-2.4.schemas
 %{_bindir}/*
 %{_datadir}/applications/redhat-evolution-mail.desktop
 %{_datadir}/applications/redhat-evolution-calendar.desktop
@@ -354,6 +363,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution/%{evo_major}
 %dir %{_libdir}/evolution/%{evo_major}/components
 %dir %{_libdir}/evolution/%{evo_major}/components/*.so
+%dir %{_libdir}/evolution/%{evo_major}/plugins
 %{_libdir}/evolution/%{evo_major}/*.so.*
 %{_libdir}/evolution/%{evo_major}/plugins/*.eplug
 %{_libdir}/evolution/%{evo_major}/plugins/*.so
@@ -374,6 +384,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Oct 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-7
+- Added a patch (110) to hide the component switcher buttons by default on new
+  windows (#170799) by patching the GConf schema.
+- Made list of installed schemas explicit.
+- Own the plugins subdirectory
+
 * Tue Oct 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-6
 - use 4 separate .desktop files from the redhat-menus package, rather than the
   current single one; bump the redhat-menus requirement accordingly (from 1.13