dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-evolution-2.26.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+evolution-2.26.3.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist 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
-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)

evolution-2.26.1-attachment-bar-crasher.patch

@@ -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)

evolution-2.26.3-missing-gconf-schemas.patch

@@ -0,0 +1,68 @@
+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 11:58:24.000000000 -0400
+@@ -4,6 +4,17 @@
+     <!-- Display -->
+ 
+     <schema>
++      <key>/schemas/apps/evolution/calendar/display/primary_calendar</key>
++      <applyto>/apps/evolution/calendar/display/primary_calendar</applyto>
++      <owner>evolution-calendar</owner>
++      <type>string</type>
++      <locale name="C">
++        <short>Primary calendar</short>
++        <long>URI of the highlighted ("primary") calendar</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/evolution/calendar/display/timezone</key>
+       <applyto>/apps/evolution/calendar/display/timezone</applyto>
+       <owner>evolution-calendar</owner>
+@@ -400,9 +411,46 @@
+       </locale>
+     </schema>
+ 
++    <schema>
++      <key>/schemas/apps/evolution/calendar/display/use_system_timezone</key>
++      <applyto>/apps/evolution/calendar/display/use_system_timezone</applyto>
++      <owner>evolution-calendar</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Use system timezone</short>
++        <long>Use the system timezone instead of the timezone selected
++        in Evolution.</long>
++      </locale>
++    </schema>
++
++    <!-- Memos -->
++
++    <schema>
++      <key>/schemas/apps/evolution/calendar/memos/primary_memos</key>
++      <applyto>/apps/evolution/calendar/memos/primary_memos</applyto>
++      <owner>evolution-calendar</owner>
++      <type>string</type>
++      <locale name="C">
++        <short>Primary memo list</short>
++        <long>URI of the highlighted ("primary") memo list</long>
++      </locale>
++    </schema>
++
+     <!-- Tasks -->
+ 
+     <schema>
++      <key>/schemas/apps/evolution/calendar/tasks/primary_tasks</key>
++      <applyto>/apps/evolution/calendar/tasks/primary_tasks</applyto>
++      <owner>evolution-calendar</owner>
++      <type>string</type>
++      <locale name="C">
++        <short>Primary task list</short>
++        <long>URI of the highlighted ("primary") task list</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/evolution/calendar/tasks/hide_completed</key>
+       <applyto>/apps/evolution/calendar/tasks/hide_completed</applyto>
+       <owner>evolution-calendar</owner>

evolution.spec

@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.26.1
+Version: 2.26.3
-Release: 2%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -68,8 +68,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# GNOME bug #578685
+# Add missing GConf schemas
-Patch13: evolution-2.26.1-attachment-bar-crasher.patch
+Patch13: evolution-2.26.3-missing-gconf-schemas.patch
 
 ## Dependencies ###
 
@@ -80,10 +80,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 ###
 
@@ -190,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<tm> or other
@@ -228,7 +225,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 .attachment-bar-crasher
+%patch13 -p1 -b .missing-gconf-schemas
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -471,7 +468,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.*
@@ -665,6 +661,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
@@ -695,6 +692,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Tue Aug 04 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.3-5.fc11
+- Don't require gnome-pilot in the conduits subpackage.
+
+* Fri Jul 31 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.3-4.fc11
+- Add some missing GConf schemas.
+
+* Tue Jul 28 2009 Matthew Barnes <mbarnes@redhat.com> - 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 <mbarnes@redhat.com> - 2.26.3-2.fc11
+- Drop libpst requirement until its API stablizes.
+
+* Tue Jun 30 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.3-1.fc11
+- Update to 2.26.3
+
+* Mon May 18 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.2-1.fc11
+- Update to 2.26.2
+- Remove patch for GNOME bug #578685 (fixed upstream).
+
 * Tue Apr 14 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.1-2.fc11
 - Add patch for GNOME bug #578685 (attachment bar crasher).
 

sources

@@ -1 +1 @@
-7089171fe7e127f061f6722b33bf3107  evolution-2.26.1.tar.bz2
+fcc487503ab91b9e25fd529abc87fdae  evolution-2.26.3.tar.bz2