Hello community, here is the log from the commit of package evolution-data-server for openSUSE:Factory checked in at 2012-01-19 16:54:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-data-server (Old) and /work/SRC/openSUSE:Factory/.evolution-data-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-data-server", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-data-server/evolution-data-server.changes 2011-10-18 14:11:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-data-server.new/evolution-data-server.changes 2012-01-19 16:55:03.000000000 +0100 @@ -1,0 +2,76 @@ +Wed Dec 21 08:45:04 UTC 2011 - vuntz@opensuse.org + +- Add evolution-data-server-fix-introspection-build.patch: fix + build of introspection support. +- Set %with_introspection macro to 1 now that we can build + introspection support again. + +------------------------------------------------------------------- +Tue Dec 20 13:26:28 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Be more responsive to cancellations. + + Add --wait-for-client factory processes command line option + + Fix leaks. + + Various other code changes. + + Bugs fixed: bgo#665253, bgo#662068, bgo#666106, bgo#652173, + bgo#665337, bgo#664819, bgo#664572, bgo#652177. + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Bump so_camel define to 32 and so_edata_cal to 15, to follow + library soversion changes. +- Update baselibs.conf for library soversion changes. +- Split typelib files into typelib-1_0-EBook-1_2, + typelib-1_0-ECalendar-1_2, typelib-1_0-EDataServer-1_2 + subpackages. +- Add typelib-1_0-EBook-1_2, typelib-1_0-ECalendar-1_2, + typelib-1_0-EDataServer-1_2 Requires to devel subpackage. + +------------------------------------------------------------------- +Mon Nov 21 08:05:04 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Various code changes. + + Bugs fixed: bgo#440316, bgo#652171, bgo#652175, bgo#655167, + bgo#659736, bgo#660182, bgo#660646, bgo#660972, bgo#660974, + bgo#661033, bgo#662473, bgo#662524, bgo#662643, bgo#662929, + bgo#663062, bgo#663219 + + Updated translations. + +------------------------------------------------------------------- +Thu Oct 27 18:18:27 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1.1: + + Work around libgthread shenanigans in GLib 2.31. +- Drop evolution-data-server-g_thread.patch: fixed upstream. +- Update the soname defines following library soversion changes. +- Change evo_version to 3.4, as this is the development tree + leading to evolution-data-server 3.4. +- Add a with_introspection defines to easily enable/disable + building of gobject-introspection and vala bindings. Currently, + this is disabled due to bgo#662888. Based on with_introspection, + pass either --disable-vala-bindings --disable-introspection (if + with_introspection=0) or --enable-vala-bindings + --enable-introspection (with_introspection=1) to configure. + +------------------------------------------------------------------- +Wed Oct 26 19:46:39 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1: + + Fix crashes. + + Various other code changes. + + Bugs fixed: + - bgo#601898: SOCKS proxy does not work with mailer + - bgo#660870: Empty contacts list when pressing To: in composer + - bgo#527614, bgo#620382, bgo#632619, bgo#642984, bgo#655252, + bgo#656473, bgo#656603, bgo#659438, bgo#659553, bgo#659555, + bgo#659568, bgo#659914, bgo#660246, bgo#660533, bgo#660615, + bgo#660656, bgo#660829, bgo#660884, bgo#661432, bgo#661448, + bgo#661549. + + Updated translations. +- Add evolution-data-server-g_thread.patch: do not call + g_thread_init; taken from upstream git. + +------------------------------------------------------------------- Old: ---- evolution-data-server-3.2.1.tar.bz2 New: ---- evolution-data-server-3.3.3.tar.xz evolution-data-server-fix-introspection-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.fIuitx/_old 2012-01-19 16:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.fIuitx/_new 2012-01-19 16:55:05.000000000 +0100 @@ -17,28 +17,31 @@ %define USE_EVOLDAP 0 +%define with_introspection 1 # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 29 -%define so_ebackend 1 -%define so_ebook 12 -%define so_ecal 10 -%define so_edata_book 11 -%define so_edata_cal 13 -%define so_edataserver 15 +%define so_camel 32 +%define so_ebackend 2 +%define so_ebook 13 +%define so_ecal 11 +%define so_edata_book 13 +%define so_edata_cal 15 +%define so_edataserver 16 %define so_edataserverui 1 Name: evolution-data-server -%define _evo_version 3.2 -License: LGPLv2+ -Group: Development/Libraries/GNOME -Version: 3.2.1 -Release: 1 +%define _evo_version 3.4 +Version: 3.3.3 +Release: 0 Summary: Evolution Data Server +License: LGPL-2.1+ +Group: Development/Libraries/GNOME Url: http://www.gnome.org -Source0: http://download.gnome.org/sources/evolution-data-server/3.2/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/evolution-data-server/3.3/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM evolution-data-server-fix-introspection-build.patch bgo#662888 vuntz@opensuse.org -- Fix build of introspection data +Patch0: evolution-data-server-fix-introspection-build.patch BuildRequires: bison BuildRequires: db-devel %if %USE_EVOLDAP @@ -68,6 +71,8 @@ BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: vala +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz %if %USE_EVOLDAP Requires: libevoldap-2_4-2 %endif @@ -128,6 +133,19 @@ This package contains a shared system library to access calendars. +%if %{?with_introspection} +%package -n typelib-1_0-ECalendar-1_2 +Summary: Evolution Data Server - Calendar Client Library, Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-ECalendar-1_2 +Evolution Data Server provides a central location for your address book +and calendar in the GNOME Desktop. + +This package provides the GObject Introspection bindings for the library +to access calendars. +%endif + %package -n libedata-book-1_2-%{so_edata_book} Summary: Evolution Data Server - Address Book Backend Library Group: System/Libraries @@ -138,6 +156,19 @@ This package contains a shared system library for address book backends. +%if %{?with_introspection} +%package -n typelib-1_0-EBook-1_2 +Summary: Evolution Data Server - Address Book Backend Library, Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-EBook-1_2 +Evolution Data Server provides a central location for your address book +and calendar in the GNOME Desktop. + +This package provides the GObject Introspection bindings for the library +for address book backends. +%endif + %package -n libedata-cal-1_2-%{so_edata_cal} Summary: Evolution Data Server - Calendar Backend Library Group: System/Libraries @@ -158,6 +189,19 @@ This package contains a shared system library. +%if %{?with_introspection} +%package -n typelib-1_0-EDataServer-1_2 +Summary: Evolution Data Server - Utilities Library, Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-EDataServer-1_2 +Evolution Data Server provides a central location for your address book +and calendar in the GNOME Desktop. + +This package provides the GObject Introspection bindings for the +libedataserver library. +%endif + %package -n libedataserverui-3_0-%{so_edataserverui} Summary: Evolution Data Server - Graphical Utilities Library Group: System/Libraries @@ -169,7 +213,6 @@ This package contains a shared system library. %package devel -License: LGPLv2+ Summary: Evolution Data Server - Development Files Group: Development/Libraries/GNOME Requires: evolution-data-server = %{?epoch:}%{version} @@ -181,6 +224,11 @@ Requires: libedata-cal-1_2-%{so_edata_cal} = %{version} Requires: libedataserver-1_2-%{so_edataserver} = %{version} Requires: libedataserverui-3_0-%{so_edataserverui} = %{version} +%if %{?with_introspection} +Requires: typelib-1_0-EBook-1_2 = %{version} +Requires: typelib-1_0-ECalendar-1_2 = %{version} +Requires: typelib-1_0-EDataServer-1_2 = %{version} +%endif %if %USE_EVOLDAP Requires: evoldap2-devel %else @@ -194,7 +242,6 @@ information. %package doc -License: LGPLv2+ Summary: Evolution Data Server - Developer Documentation Group: Development/Libraries/GNOME Requires: %{name} = %{version} @@ -209,6 +256,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %{configure} \ @@ -223,8 +271,14 @@ --enable-ipv6=yes \ --enable-smime=yes \ --enable-nntp=yes \ + --disable-static \ +%if %{?with_introspection} --enable-vala-bindings \ - --disable-static + --enable-introspection +%else + --disable-vala-bindings \ + --disable-introspection +%endif make %{?_smp_mflags} V=1 %install @@ -292,7 +346,6 @@ %files -n libcamel-1_2-%{so_camel} %defattr(-, root, root) %{_libdir}/libcamel-1.2.so.%{so_camel}* -%{_libdir}/libcamel-provider-1.2.so.%{so_camel}* %files -n libebackend-1_2-%{so_ebackend} %defattr(-, root, root) @@ -305,12 +358,22 @@ %files -n libecal-1_2-%{so_ecal} %defattr(-, root, root) %{_libdir}/libecal-1.2.so.%{so_ecal}* + +%if %{?with_introspection} +%files -n typelib-1_0-ECalendar-1_2 +%defattr(-, root, root) %{_libdir}/girepository-1.0/ECalendar-1.2.typelib +%endif %files -n libedata-book-1_2-%{so_edata_book} %defattr(-, root, root) %{_libdir}/libedata-book-1.2.so.%{so_edata_book}* + +%if %{?with_introspection} +%files -n typelib-1_0-EBook-1_2 +%defattr(-, root, root) %{_libdir}/girepository-1.0/EBook-1.2.typelib +%endif %files -n libedata-cal-1_2-%{so_edata_cal} %defattr(-, root, root) @@ -319,7 +382,12 @@ %files -n libedataserver-1_2-%{so_edataserver} %defattr(-, root, root) %{_libdir}/libedataserver-1.2.so.%{so_edataserver}* + +%if %{?with_introspection} +%files -n typelib-1_0-EDataServer-1_2 +%defattr(-, root, root) %{_libdir}/girepository-1.0/EDataServer-1.2.typelib +%endif %files -n libedataserverui-3_0-%{so_edataserverui} %defattr(-, root, root) @@ -330,11 +398,13 @@ %{_includedir}/evolution-data-server-%{_evo_version}/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%if %{?with_introspection} %{_datadir}/gir-1.0/*.gir %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/*.deps %{_datadir}/vala/vapi/*.vapi +%endif %files doc %defattr(-, root, root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.fIuitx/_old 2012-01-19 16:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.fIuitx/_new 2012-01-19 16:55:05.000000000 +0100 @@ -1,8 +1,8 @@ -libcamel-1_2-29 -libebackend-1_2-1 -libebook-1_2-12 -libecal-1_2-10 -libedata-book-1_2-11 -libedata-cal-1_2-13 -libedataserver-1_2-15 +libcamel-1_2-32 +libebackend-1_2-2 +libebook-1_2-13 +libecal-1_2-11 +libedata-book-1_2-13 +libedata-cal-1_2-15 +libedataserver-1_2-16 libedataserverui-3_0-1 ++++++ evolution-data-server-fix-introspection-build.patch ++++++
From c92f1c0f25d8bb590c0ea9439a4b179df9159b7b Mon Sep 17 00:00:00 2001 From: Colin Walters
Date: Tue, 20 Dec 2011 13:27:54 -0500 Subject: [PATCH] build: Use --include-uninstalled for internal .gir files
Otherwise we end up with a dependency on an installed pkg-config file. https://bugzilla.gnome.org/show_bug.cgi?id=662888 --- addressbook/libebook/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am index fce463e..602fbe0 100644 --- a/addressbook/libebook/Makefile.am +++ b/addressbook/libebook/Makefile.am @@ -85,7 +85,7 @@ if HAVE_INTROSPECTION introspection_sources = $(libebook_1_2_la_SOURCES) EBook-1.2.gir: libebook-1.2.la -EBook_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0 libxml2-2.0 \ +EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 \ Gio-2.0 \ $(NULL) libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0` @@ -100,6 +100,7 @@ EBook_1_2_gir_CFLAGS = $(INCLUDES) \ -I$(top_srcdir)/addressbook/libebook \ -I$(top_builddir)/addressbook/libebook \ $(NULL) +EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir EBook_1_2_gir_LIBS = \ libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la EBook_1_2_gir_FILES = $(libebook_1_2_la_SOURCES) $(libebookinclude_HEADERS) -- 1.7.6.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org