Hello community, here is the log from the commit of package evolution-sharp for openSUSE:Factory checked in at 2012-10-04 18:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-sharp (Old) and /work/SRC/openSUSE:Factory/.evolution-sharp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-sharp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-sharp/evolution-sharp.changes 2012-01-09 12:03:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-sharp.new/evolution-sharp.changes 2012-10-04 18:38:42.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Jun 25 19:00:54 UTC 2012 - [email protected] + +- Update evolution-sharp-newer-evo.patch to build with current + version of e-d-s (3.5.3+ / 3.6.x). +- Add evolution-sharp-eds36.patch: Only the main headers can be + included now. + +------------------------------------------------------------------- +Thu May 17 17:49:32 UTC 2012 - [email protected] + +- Update evolution-sharp-newer-evo.patch to build with current + version of e-d-s (3.5.x / 3.6.x). + +------------------------------------------------------------------- New: ---- evolution-sharp-eds36.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-sharp.spec ++++++ --- /var/tmp/diff_new_pack.qS2Ly5/_old 2012-10-04 18:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.qS2Ly5/_new 2012-10-04 18:38:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package evolution-sharp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: evolution-sharp BuildRequires: evolution-data-server-devel BuildRequires: glib-sharp2 @@ -34,6 +35,8 @@ Patch0: evolution-sharp-newer-evo.patch # PATCH-FIX-UPSTREAM task-field-changes.diff bgo583866 Patch2: task-field-changes.diff +# PATCH-FIX-UPSTREAM evolution-sharp-eds36.patch [email protected] -- With e-d-s 3.6, only the main headers can be included. +Patch3: evolution-sharp-eds36.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{name}-devel = %{version}-%{release} @@ -44,6 +47,7 @@ %setup -q %patch0 -p1 %patch2 +%patch3 -p1 %build autoreconf -fi ++++++ evolution-sharp-eds36.patch ++++++ Index: evolution-sharp-0.21.1/glue/cal/e-cal-glue-comp.h =================================================================== --- evolution-sharp-0.21.1.orig/glue/cal/e-cal-glue-comp.h +++ evolution-sharp-0.21.1/glue/cal/e-cal-glue-comp.h @@ -4,7 +4,7 @@ #include <glib.h> #include <time.h> #include <glib-object.h> -#include <libecal/e-cal.h> +#include <libecal/libecal.h> #include <libical/ical.h> int e_cal_component_get_priority2 (ECalComponent* comp); Index: evolution-sharp-0.21.1/glue/cal/e-cal-glue.h =================================================================== --- evolution-sharp-0.21.1.orig/glue/cal/e-cal-glue.h +++ evolution-sharp-0.21.1/glue/cal/e-cal-glue.h @@ -2,9 +2,7 @@ #define __E_CAL_GLUE_H 1 #include <string.h> -#include <libecal/e-cal.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-time-util.h> +#include <libecal/libecal.h> #include <libical/ical.h> #include "e-cal-glue-comp.h" Index: evolution-sharp-0.21.1/glue/addressbook/e-book-glue.c =================================================================== --- evolution-sharp-0.21.1.orig/glue/addressbook/e-book-glue.c +++ evolution-sharp-0.21.1/glue/addressbook/e-book-glue.c @@ -1,4 +1,4 @@ -#include <libebook/e-book.h> +#include <libebook/libebook.h> gboolean e_book_glue_ebook_get_changes (EBook* ebook, Index: evolution-sharp-0.21.1/glue/addressbook/e-contact-photo-glue.h =================================================================== --- evolution-sharp-0.21.1.orig/glue/addressbook/e-contact-photo-glue.h +++ evolution-sharp-0.21.1/glue/addressbook/e-contact-photo-glue.h @@ -22,7 +22,7 @@ #ifndef _E_CONTACT_PHOTO_GLUE_H_ #define _E_CONTACT_PHOTO_GLUE_H_ -#include <libebook/e-contact.h> +#include <libebook/libebook.h> EContactPhoto* e_contact_photo_glue_new (EContactPhotoType type); void e_contact_photo_glue_free (EContactPhoto* photo); ++++++ evolution-sharp-newer-evo.patch ++++++ --- /var/tmp/diff_new_pack.qS2Ly5/_old 2012-10-04 18:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.qS2Ly5/_new 2012-10-04 18:38:43.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- evolution-sharp-0.21.1.orig/configure.in +++ evolution-sharp-0.21.1/configure.in -@@ -16,8 +16,10 @@ fi +@@ -16,8 +16,11 @@ fi PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no])) PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no])) PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no])) @@ -11,11 +11,12 @@ +PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.33.0, edsver="2.24", AC_MSG_RESULT([no])) +PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_92, evolution-data-server-1.2 >= 2.91.1 evolution-data-server-1.2 < 3.1.0, edsver="2.92", AC_MSG_RESULT([no])) +PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_3_4, evolution-data-server-1.2 >= 3.3.0 evolution-data-server-1.2 < 3.5, edsver="3.4", AC_MSG_RESULT([no])) -+PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 3.5.0, edsver="unsupported", AC_MSG_RESULT([no])) ++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_3_6, evolution-data-server-1.2 >= 3.5.0 evolution-data-server-1.2 < 3.7, edsver="3.6", AC_MSG_RESULT([no])) ++PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 3.7.0, edsver="unsupported", AC_MSG_RESULT([no])) if test "x$edsver" = "x1.8"; then EDS_VERSION=-1.2 -@@ -39,6 +41,27 @@ elif test "x$edsver" = "x2.24"; then +@@ -39,6 +41,34 @@ elif test "x$edsver" = "x2.24"; then ECAL_SOVERSION=7 EBACKEND_SOVERSION=0 EDATACAL_SOVERSION=6 @@ -36,20 +37,28 @@ +elif test "x$edsver" = "x3.4"; then + EDS_VERSION=-1.2 + EDS_SOVERSION=16 -+ EBOOK_SOVERSION=13 ++ EBOOK_SOVERSION=13 + ECAL_SOVERSION=11 + EBACKEND_SOVERSION=2 + EDATACAL_SOVERSION=14 ++elif test "x$edsver" = "x3.6"; then ++ EDS_VERSION=-1.2 ++ EDS_SOVERSION=17 ++ EBOOK_SOVERSION=14 ++ ECAL_SOVERSION=15 ++ EBACKEND_SOVERSION=4 ++ EDATACAL_SOVERSION=18 elif test "x$edsver" = "xunsupported"; then AC_MSG_ERROR([ -@@ -87,6 +110,9 @@ AM_CONDITIONAL(USE_EDS_1_8, test "x$edsv +@@ -87,6 +110,10 @@ AM_CONDITIONAL(USE_EDS_1_8, test "x$edsv AM_CONDITIONAL(USE_EDS_1_9, test "x$edsver" = "x1.9") AM_CONDITIONAL(USE_EDS_1_10, test "x$edsver" = "x1.10") AM_CONDITIONAL(USE_EDS_2_24, test "x$edsver" = "x2.24") +AM_CONDITIONAL(USE_EDS_2_92, test "x$edsver" = "x2.92") +AM_CONDITIONAL(USE_EDS_3_2, test "x$edsver" = "x3.2") +AM_CONDITIONAL(USE_EDS_3_4, test "x$edsver" = "x3.4") ++AM_CONDITIONAL(USE_EDS_3_6, test "x$edsver" = "x3.6") PKG_CHECK_MODULES(MONO, mono >= 1.0.0) AC_PATH_PROG(CSC, mcs, no) @@ -57,7 +66,7 @@ =================================================================== --- evolution-sharp-0.21.1.orig/evolution/Makefile.am +++ evolution-sharp-0.21.1/evolution/Makefile.am -@@ -25,6 +25,27 @@ SOURCES_2_24 = src/CalComponentDateTime. +@@ -25,6 +25,34 @@ SOURCES_2_24 = src/CalComponentDateTime. CSFLAGS = -define:USE_EDS_2_24 endif @@ -79,6 +88,13 @@ +RAW_API = evolution-api.raw +CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom +SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs ++CSFLAGS = -define:USE_EDS_2_24 ++endif ++ ++if USE_EDS_3_6 ++RAW_API = evolution-api.raw ++CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom ++SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs +CSFLAGS = -define:USE_EDS_2_24 +endif + ++++++ task-field-changes.diff ++++++ --- /var/tmp/diff_new_pack.qS2Ly5/_old 2012-10-04 18:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.qS2Ly5/_new 2012-10-04 18:38:43.000000000 +0200 @@ -1,8 +1,8 @@ Index: evolution/src/CalCompChanges.cs =================================================================== ---- evolution/src/CalCompChanges.cs (revision 200) -+++ evolution/src/CalCompChanges.cs (working copy) -@@ -116,5 +116,46 @@ +--- evolution/src/CalCompChanges.cs.orig ++++ evolution/src/CalCompChanges.cs +@@ -116,5 +116,46 @@ namespace Evolution } } @@ -49,3 +49,5 @@ + } } + + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
