From 4c8c0e0f7a662ac18e1ab0cd49ad312bddb2dcce Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:35:45 +0000 Subject: [PATCH 01/10] Initialize branch F-11 for evolution --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 14a1c9464d836b46d8e894402c0046fa046eafde Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 May 2009 14:08:20 +0000 Subject: [PATCH 02/10] - Update to 2.26.2 - Remove patch for GNOME bug #578685 (fixed upstream). --- .cvsignore | 2 +- evolution-2.26.1-attachment-bar-crasher.patch | 12 ------------ evolution.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 evolution-2.26.1-attachment-bar-crasher.patch diff --git a/.cvsignore b/.cvsignore index 7491dd2..0f3298c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.26.1.tar.bz2 +evolution-2.26.2.tar.bz2 diff --git a/evolution-2.26.1-attachment-bar-crasher.patch b/evolution-2.26.1-attachment-bar-crasher.patch deleted file mode 100644 index 4cc84d2..0000000 --- a/evolution-2.26.1-attachment-bar-crasher.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c ---- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher 2009-04-14 12:49:45.000000000 -0400 -+++ evolution-2.26.1/widgets/misc/e-attachment-bar.c 2009-04-14 12:50:54.000000000 -0400 -@@ -450,6 +450,8 @@ update (EAttachmentBar *bar) - if (desc) - desc = g_strdup (desc); - } -+ } else { -+ desc = g_strdup (desc); - } - - if (!desc) diff --git a/evolution.spec b/evolution.spec index e79a08b..c5eb5cd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.26.1 -Release: 2%{?dist} +Version: 2.26.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,9 +68,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# GNOME bug #578685 -Patch13: evolution-2.26.1-attachment-bar-crasher.patch - ## Dependencies ### Requires(post): GConf2 @@ -228,7 +225,6 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .attachment-bar-crasher mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -695,6 +691,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon May 18 2009 Matthew Barnes - 2.26.2-1.fc11 +- Update to 2.26.2 +- Remove patch for GNOME bug #578685 (fixed upstream). + * Tue Apr 14 2009 Matthew Barnes - 2.26.1-2.fc11 - Add patch for GNOME bug #578685 (attachment bar crasher). diff --git a/sources b/sources index 94d77bd..8d623fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7089171fe7e127f061f6722b33bf3107 evolution-2.26.1.tar.bz2 +f93b02141a8e67588ed258d0dc310a0f evolution-2.26.2.tar.bz2 From ea010d154ffebc5d557aa1bb802b7f3c4185d27d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 16:25:36 +0000 Subject: [PATCH 03/10] - Update to 2.26.3 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0f3298c..f4eff1e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.26.2.tar.bz2 +evolution-2.26.3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index c5eb5cd..c7eb989 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.26.2 +Version: 2.26.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -691,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jun 30 2009 Matthew Barnes - 2.26.3-1.fc11 +- Update to 2.26.3 + * Mon May 18 2009 Matthew Barnes - 2.26.2-1.fc11 - Update to 2.26.2 - Remove patch for GNOME bug #578685 (fixed upstream). diff --git a/sources b/sources index 8d623fe..a013ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f93b02141a8e67588ed258d0dc310a0f evolution-2.26.2.tar.bz2 +fcc487503ab91b9e25fd529abc87fdae evolution-2.26.3.tar.bz2 From 89cc79b53dab3e486062d45df12e8bdc2bbc910a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 10 Jul 2009 14:56:41 +0000 Subject: [PATCH 04/10] - Drop libpst requirement until its API stablizes. --- evolution.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index c7eb989..a01b535 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -77,10 +77,8 @@ Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. Requires: evolution-data-server >= %{version} -# No devel package for libpst, despite the name. Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes -Requires: libpst ### Build Dependencies ### @@ -691,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Jul 10 2009 Matthew Barnes - 2.26.3-2.fc11 +- Drop libpst requirement until its API stablizes. + * Tue Jun 30 2009 Matthew Barnes - 2.26.3-1.fc11 - Update to 2.26.3 From 208b04e27002b16ba14ad035597b797af8158e83 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Jul 2009 16:44:55 +0000 Subject: [PATCH 05/10] - Move libeconduit.so into the conduits subpackage to see if that untangles us from gnome-pilot. --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index a01b535..691a86e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -465,7 +465,6 @@ rm -rf $RPM_BUILD_ROOT # Shared libraries: %{_libdir}/evolution/%{evo_major}/libeabutil.so.* -%{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* %{_libdir}/evolution/%{evo_major}/libefilterbar.so.* @@ -659,6 +658,7 @@ rm -rf $RPM_BUILD_ROOT %files conduits %defattr(-, root, root) %dir %{_libdir}/evolution/%{evo_major}/conduits +%{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so @@ -689,6 +689,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jul 28 2009 Matthew Barnes - 2.26.3-3.fc11 +- Move libeconduit.so into the conduits subpackage to see if that + untangles us from gnome-pilot. + * Fri Jul 10 2009 Matthew Barnes - 2.26.3-2.fc11 - Drop libpst requirement until its API stablizes. From 054d240662c38d54ff115cfca79778399a3ecb1a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 31 Jul 2009 11:18:51 +0000 Subject: [PATCH 06/10] - Add some missing GConf schemas. --- evolution-2.26.3-missing-gconf-schemas.patch | 55 ++++++++++++++++++++ evolution.spec | 9 +++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 evolution-2.26.3-missing-gconf-schemas.patch diff --git a/evolution-2.26.3-missing-gconf-schemas.patch b/evolution-2.26.3-missing-gconf-schemas.patch new file mode 100644 index 0000000..767015d --- /dev/null +++ b/evolution-2.26.3-missing-gconf-schemas.patch @@ -0,0 +1,55 @@ +diff -up evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in.missing-gconf-schemas evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in +--- evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in.missing-gconf-schemas 2009-06-26 10:49:50.000000000 -0400 ++++ evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in 2009-07-31 06:55:42.000000000 -0400 +@@ -4,6 +4,17 @@ + + + ++ /schemas/apps/evolution/calendar/display/primary_calendar ++ /apps/evolution/calendar/display/primary_calendar ++ evolution-calendar ++ string ++ ++ Primary calendar ++ URI of the highlighted ("primary") calendar ++ ++ ++ ++ + /schemas/apps/evolution/calendar/display/timezone + /apps/evolution/calendar/display/timezone + evolution-calendar +@@ -400,9 +411,33 @@ + + + ++ ++ ++ ++ /schemas/apps/evolution/calendar/memos/primary_memos ++ /apps/evolution/calendar/memos/primary_memos ++ evolution-calendar ++ string ++ ++ Primary memo list ++ URI of the highlighted ("primary") memo list ++ ++ ++ + + + ++ /schemas/apps/evolution/calendar/tasks/primary_tasks ++ /apps/evolution/calendar/tasks/primary_tasks ++ evolution-calendar ++ string ++ ++ Primary task list ++ URI of the highlighted ("primary") task list ++ ++ ++ ++ + /schemas/apps/evolution/calendar/tasks/hide_completed + /apps/evolution/calendar/tasks/hide_completed + evolution-calendar diff --git a/evolution.spec b/evolution.spec index 691a86e..d808b0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.3 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,6 +68,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Add missing GConf schemas +Patch13: evolution-2.26.3-missing-gconf-schemas.patch + ## Dependencies ### Requires(post): GConf2 @@ -223,6 +226,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .missing-gconf-schemas mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -689,6 +693,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Jul 31 2009 Matthew Barnes - 2.26.3-4.fc11 +- Add some missing GConf schemas. + * Tue Jul 28 2009 Matthew Barnes - 2.26.3-3.fc11 - Move libeconduit.so into the conduits subpackage to see if that untangles us from gnome-pilot. From b6bd2f8bdedc9b5643591379d73ca18b353cf5d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 31 Jul 2009 15:59:11 +0000 Subject: [PATCH 07/10] - Add some missing GConf schemas. --- evolution-2.26.3-missing-gconf-schemas.patch | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/evolution-2.26.3-missing-gconf-schemas.patch b/evolution-2.26.3-missing-gconf-schemas.patch index 767015d..17c07af 100644 --- a/evolution-2.26.3-missing-gconf-schemas.patch +++ b/evolution-2.26.3-missing-gconf-schemas.patch @@ -1,6 +1,6 @@ diff -up evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in.missing-gconf-schemas evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in --- evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in.missing-gconf-schemas 2009-06-26 10:49:50.000000000 -0400 -+++ evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in 2009-07-31 06:55:42.000000000 -0400 ++++ evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in 2009-07-31 11:58:24.000000000 -0400 @@ -4,6 +4,17 @@ @@ -19,10 +19,23 @@ diff -up evolution-2.26.3/calendar/gui/apps_evolution_calendar.schemas.in.missin /schemas/apps/evolution/calendar/display/timezone /apps/evolution/calendar/display/timezone evolution-calendar -@@ -400,9 +411,33 @@ +@@ -400,9 +411,46 @@ ++ ++ /schemas/apps/evolution/calendar/display/use_system_timezone ++ /apps/evolution/calendar/display/use_system_timezone ++ evolution-calendar ++ bool ++ false ++ ++ Use system timezone ++ Use the system timezone instead of the timezone selected ++ in Evolution. ++ ++ ++ + + + From 7924b67b48b643a2e6a13cf3299cc8d6ddc1fb8d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Aug 2009 16:33:25 +0000 Subject: [PATCH 08/10] - Don't require gnome-pilot in the conduits subpackage. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d808b0c..8cb617d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -188,7 +188,6 @@ This package contains user documentation for %{name}. Group: Applications/Communications Summary: gnome-pilot conduits for %{name} Requires: %{name} = %{version}-%{release} -Requires: gnome-pilot >= %{gnome_pilot_version} %description conduits This package contains conduits for synchronizing PalmPilot or other @@ -693,6 +692,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Aug 04 2009 Matthew Barnes - 2.26.3-5.fc11 +- Don't require gnome-pilot in the conduits subpackage. + * Fri Jul 31 2009 Matthew Barnes - 2.26.3-4.fc11 - Add some missing GConf schemas. From b73d31882cfb7604630d96ae3549b22b30050ca4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:59 +0000 Subject: [PATCH 09/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd23cb0..c22b7db 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: evolution -# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $ NAME := evolution SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 88f4beb7b28d2f64c904df3b9d6373cc255f2b56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:02:28 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b7db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: evolution -# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $ -NAME := evolution -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11