From 46d9bf94a7687bd13bb30e217212f3004b8c6c6a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sep 01 2009 19:06:40 +0000 Subject: - Snapshot of "kill-bonobo" branch at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. --- diff --git a/.cvsignore b/.cvsignore index f114c30..360e44e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 +evolution-2.29.1-kill-bonobo-f945e64.tar.bz2 diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch new file mode 100644 index 0000000..104f02f --- /dev/null +++ b/evolution-kb-override-version.patch @@ -0,0 +1,24 @@ +diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac +--- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version 2009-09-01 15:02:53.028656991 -0400 ++++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac 2009-09-01 15:03:19.843363079 -0400 +@@ -1,7 +1,7 @@ + dnl Evolution Versions + m4_define([evo_major_version], [2]) +-m4_define([evo_minor_version], [29]) +-m4_define([evo_micro_version], [1]) ++m4_define([evo_minor_version], [27]) ++m4_define([evo_micro_version], [99]) + m4_define([evo_version], + [evo_major_version.evo_minor_version.evo_micro_version]) + m4_define([evo_stable_version], +@@ -13,8 +13,8 @@ dnl Base Version: This is for API/versio + dnl Bonobo server files. This should always be the major/minor of + dnl the stable version or stable version to be. Note, this is set + dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly. +-BASE_VERSION=2.30 +-m4_define([base_version], [2.30]) ++BASE_VERSION=2.28 ++m4_define([base_version], [2.28]) + + dnl Upgrade Revision: This is for triggering migration calls between + dnl varying versions. Reset to 0 whenever BASE_VERSION changes. diff --git a/evolution-override-eds-version.patch b/evolution-override-eds-version.patch deleted file mode 100644 index cc46aa9..0000000 --- a/evolution-override-eds-version.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac ---- evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version 2009-08-31 19:07:26.848150729 -0400 -+++ evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac 2009-08-31 19:08:12.281366667 -0400 -@@ -49,7 +49,7 @@ GTKHTML_PACKAGE=3.14 - dnl Required Packages - m4_define([glib_minimum_version], [2.20.0]) - m4_define([gtk_minimum_version], [2.16.0]) --m4_define([eds_minimum_version], [evo_version]) -+dnl m4_define([eds_minimum_version], [evo_version]) - m4_define([gnome_icon_theme_minimum_version], [2.19.91]) - m4_define([gnome_desktop_minimum_version], [2.26.0]) - m4_define([libbonobo_minimum_version], [2.20.3]) -@@ -248,15 +248,15 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], - AC_SUBST(GNOME_PLATFORM_CFLAGS) - AC_SUBST(GNOME_PLATFORM_LIBS) - --PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], -- [libebook-$EDS_PACKAGE >= eds_minimum_version -- libecal-$EDS_PACKAGE >= eds_minimum_version -- libedataserver-$EDS_PACKAGE >= eds_minimum_version -- libedataserverui-$EDS_PACKAGE >= eds_minimum_version -- libegroupwise-$EDS_PACKAGE >= eds_minimum_version -- libebackend-$EDS_PACKAGE >= eds_minimum_version -- libgdata-$EDS_PACKAGE >= eds_minimum_version -- libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) -+dnl PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], -+dnl [libebook-$EDS_PACKAGE >= eds_minimum_version -+dnl libecal-$EDS_PACKAGE >= eds_minimum_version -+dnl libedataserver-$EDS_PACKAGE >= eds_minimum_version -+dnl libedataserverui-$EDS_PACKAGE >= eds_minimum_version -+dnl libegroupwise-$EDS_PACKAGE >= eds_minimum_version -+dnl libebackend-$EDS_PACKAGE >= eds_minimum_version -+dnl libgdata-$EDS_PACKAGE >= eds_minimum_version -+dnl libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) - - dnl ****************************** - dnl Canberra / Canberra-GTK Sound diff --git a/evolution.spec b/evolution.spec index 543183d..781d62b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash e7a7e7d +%define hash f945e64 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,14 +45,14 @@ ### Abstract ### Name: evolution -Version: 2.29.1 +Version: 2.27.99 Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: %{name}-%{version}-kill-bonobo-%{hash}.tar.bz2 +Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -69,9 +69,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Override the evolution-data-server version requirement, -# since e-d-s version 2.29 will never exist in Fedora 12. -Patch13: evolution-override-eds-version.patch +# Override the version to 2.27.99 (and API_VERSION to 2.28). +Patch13: evolution-kb-override-version.patch ## Dependencies ### @@ -229,11 +228,11 @@ Requires: %{name} = %{version}-%{release} This package contains supplemental utilities for %{name} that require Perl. %prep -%setup -q -n evolution-%{version}-kill-bonobo-%{hash} +%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .override-eds-version +%patch13 -p1 -b .override-version mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -680,10 +679,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Mon Aug 31 2009 Matthew Barnes - 2.29.1-1.kb.1.fc12 -- Snapshot of "kill-bonobo" branch at commit e7a7e7d. -- Relax the evolution-data-server version requirement. -- Bump evo_major to 2.30. +* Mon Sep 01 2009 Matthew Barnes - 2.27.99-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit f945e64. +- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier + compatibility with Fedora 12. * Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 787ce81. diff --git a/sources b/sources index 2e844fb..dd9d0ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e838844dc46e59e95c37719fd95bbdb2 evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 +658fce6142a8c152cde3054c1086a849 evolution-2.29.1-kill-bonobo-f945e64.tar.bz2