From 47f949636f13e7deeefe9b6aff0f82138e7e073cc69d96cc0b03dcc2ca1ecdf7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Nov 2011 08:25:53 +0000 Subject: [PATCH 1/2] Accepting request 93127 from home:dimstar:GNOME:Next update to 3.3.2 OBS-URL: https://build.opensuse.org/request/show/93127 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=4 --- base-version-changed.patch | 15 ------------ change-compiler-flag-dimstar.patch | 22 +++++++++++++----- evolution-ews-3.3.2.tar.bz2 | 3 +++ evolution-ews.changes | 37 ++++++++++++++++++++++++++++++ evolution-ews.spec | 32 +++++++++++++------------- evolution-ews.tar.bz2 | 3 --- 6 files changed, 72 insertions(+), 40 deletions(-) delete mode 100644 base-version-changed.patch create mode 100644 evolution-ews-3.3.2.tar.bz2 delete mode 100644 evolution-ews.tar.bz2 diff --git a/base-version-changed.patch b/base-version-changed.patch deleted file mode 100644 index a048f92..0000000 --- a/base-version-changed.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5329c41..19e5f90 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,8 +4,8 @@ AM_INIT_AUTOMAKE([gnu 1.9]) - AC_CONFIG_SRCDIR(README) - AC_CONFIG_HEADERS(config.h) - --BASE_VERSION=3.0 --m4_define([base_version], [3.0]) -+BASE_VERSION=3.2 -+m4_define([base_version], [3.2]) - AC_SUBST(BASE_VERSION) - - dnl **************************** diff --git a/change-compiler-flag-dimstar.patch b/change-compiler-flag-dimstar.patch index cf8a526..87afac1 100644 --- a/change-compiler-flag-dimstar.patch +++ b/change-compiler-flag-dimstar.patch @@ -1,13 +1,23 @@ -diff --git a/configure.ac b/configure.ac -index a219022..e66845f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,7 +90,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, +Index: evolution-ews-3.3.2/configure.ac +=================================================================== +--- evolution-ews-3.3.2.orig/configure.ac ++++ evolution-ews-3.3.2/configure.ac +@@ -67,8 +67,7 @@ dnl *********************** + dnl Compiler Warning Flags + dnl *********************** + AS_COMPILER_FLAGS(WARNING_FLAGS, +- "-DG_DISABLE_DEPRECATED +- -DPANGO_DISABLE_DEPRECATED ++ "-DPANGO_DISABLE_DEPRECATED + -DGDK_DISABLE_DEPRECATED + -DGDK_PIXBUF_DISABLE_DEPRECATED + -DGNOME_DISABLE_DEPRECATED +@@ -82,7 +81,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -Werror-implicit-function-declaration -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-declarations -Wmissing-include-dirs - -Wmissing-noreturn -Wnested-externs -Wpointer-arith + -Wmissing-noreturn -Wpointer-arith - -Wundef -Wwrite-strings -Werror") + -Wundef -Wwrite-strings") AC_SUBST(WARNING_FLAGS) diff --git a/evolution-ews-3.3.2.tar.bz2 b/evolution-ews-3.3.2.tar.bz2 new file mode 100644 index 0000000..08d36c3 --- /dev/null +++ b/evolution-ews-3.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f967f3ec2ab57dfe8d56e230fb45428a71d60d60128a319676cea2a73b9c2f21 +size 474715 diff --git a/evolution-ews.changes b/evolution-ews.changes index 0dfeeb6..3eff920 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Mon Nov 21 08:41:16 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Remove g_thread_init() calls. + + Distribute 'xz' tar archives instead of gzip. + + Fix default-enable of AM_MAINTAINER_MODE + + Do not use deprecated g_atexit. + + Bugs fixed: bgo#657320, bgo#661528, bgo#661972, bgo#662598. + + Updated translations. +- Changes from version 3.3.1: + + Adapt to various API changes. + + Prefill Host URL when creating new account + + Use SHA256 of EWS ItemId for cache filename, not the ItemId + itself. + + Updated translations. +- Enhance change-compiler-flag-dimstar.patch: Remove usage of + G_DISABLE_DEPRECATED from the build. + +------------------------------------------------------------------- +Wed Nov 16 15:26:56 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1.1: + + Work around libgthread shenanigans in GLib 2.31. + +------------------------------------------------------------------- +Wed Oct 26 19:39:56 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1: + + Adapt to various API changes. + + Prefill Host URL when creating new account. + * Use SHA256 of EWS ItemId for cache filename, not the ItemId + itself. + + Updated translations. +- Drop base-version-changed.patch: fixed upstream. +- Rebase change-compiler-flag-dimstar.patch. + ------------------------------------------------------------------- Fri Oct 14 12:44:28 UTC 2011 - vuntz@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index 0bf2743..1462c8e 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -1,7 +1,7 @@ # -# spec file for package +# spec file for package evolution-ews # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,26 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: evolution-ews # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. -%define evolution_base_version 3.2 -# This is a git checkout for now -Version: 0.31.0 +%define evolution_base_version 3.4 +Version: 3.3.2 Release: 1 License: LGPLv2.1 Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later Url: http://projects.gnome.org/evolution/ Group: Productivity/Networking/Email/Clients -Source: %{name}.tar.bz2 -# PATCH-FIX-UPSTREAM base-version-changed.patch -- Build against evo 3.2 -Patch0: base-version-changed.patch +Source: http://download.gnome.org/sources/evolution-ews/3.3/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE change-compiler-flag-dimstar.patch -- Temporary hack to fix build Patch1: change-compiler-flag-dimstar.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream -BuildRequires: pkgconfig(camel-provider-1.2) BuildRequires: pkgconfig(evolution-data-server-1.2) BuildRequires: pkgconfig(evolution-plugin-3.0) BuildRequires: pkgconfig(evolution-shell-3.0) @@ -98,13 +96,12 @@ later). %lang_package %prep -%setup -q -n %{name} +%setup -q translation-update-upstream -%patch0 -p1 %patch1 -p1 %build -NOCONFIGURE=1 ./autogen.sh +NOCONFIGURE=1 gnome-autogen.sh %{configure} \ --disable-static make %{?_smp_mflags} @@ -139,11 +136,13 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print %files -n libeews-1_2-0 %defattr(-, root, root) -%{_libdir}/libeews-1.2.so.* +%dir %{_libdir}/evolution-data-server-%{evolution_base_version} +%{_libdir}/evolution-data-server-%{evolution_base_version}/libeews-1.2.so.* %files -n libewsutils0 %defattr(-, root, root) -%{_libdir}/libewsutils.so.* +%dir %{_libdir}/evolution-data-server-%{evolution_base_version} +%{_libdir}/evolution-data-server-%{evolution_base_version}/libewsutils.so.* %files -n liblzx0 %defattr(-, root, root) @@ -152,8 +151,9 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print %files devel %defattr(-, root, root) %{_libdir}/pkgconfig/libeews-1.2.pc -%{_libdir}/libeews-1.2.so -%{_libdir}/libewsutils.so +%dir %{_libdir}/evolution-data-server-%{evolution_base_version} +%{_libdir}/evolution-data-server-%{evolution_base_version}/libeews-1.2.so +%{_libdir}/evolution-data-server-%{evolution_base_version}/libewsutils.so %{_libdir}/liblzx.so %dir %{_includedir}/evolution-data-server-%{evolution_base_version} %{_includedir}/evolution-data-server-%{evolution_base_version}/ews/ diff --git a/evolution-ews.tar.bz2 b/evolution-ews.tar.bz2 deleted file mode 100644 index 1b40cf4..0000000 --- a/evolution-ews.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2e1e60ab4e5d299c54548bd2c975ccf772c94c3421a18622dada12e4cc2b4ef -size 178569 From 9f5b465f26877e2838678dd7b3a7a600bfebebc0dbaac0f54f1fad85818e51da Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 05:10:53 +0000 Subject: [PATCH 2/2] Accepting request 97338 from home:vuntz:branches:GNOME:Factory Update to 3.3.3 OBS-URL: https://build.opensuse.org/request/show/97338 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=5 --- change-compiler-flag-dimstar.patch | 23 ---------------- evolution-ews-3.3.2.tar.bz2 | 3 --- evolution-ews-3.3.3.tar.xz | 3 +++ evolution-ews.changes | 42 ++++++++++++++++-------------- evolution-ews.spec | 19 +++++--------- 5 files changed, 33 insertions(+), 57 deletions(-) delete mode 100644 change-compiler-flag-dimstar.patch delete mode 100644 evolution-ews-3.3.2.tar.bz2 create mode 100644 evolution-ews-3.3.3.tar.xz diff --git a/change-compiler-flag-dimstar.patch b/change-compiler-flag-dimstar.patch deleted file mode 100644 index 87afac1..0000000 --- a/change-compiler-flag-dimstar.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: evolution-ews-3.3.2/configure.ac -=================================================================== ---- evolution-ews-3.3.2.orig/configure.ac -+++ evolution-ews-3.3.2/configure.ac -@@ -67,8 +67,7 @@ dnl *********************** - dnl Compiler Warning Flags - dnl *********************** - AS_COMPILER_FLAGS(WARNING_FLAGS, -- "-DG_DISABLE_DEPRECATED -- -DPANGO_DISABLE_DEPRECATED -+ "-DPANGO_DISABLE_DEPRECATED - -DGDK_DISABLE_DEPRECATED - -DGDK_PIXBUF_DISABLE_DEPRECATED - -DGNOME_DISABLE_DEPRECATED -@@ -82,7 +81,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, - -Werror-implicit-function-declaration - -Wformat-nonliteral -Wformat-security -Winit-self - -Wmissing-declarations -Wmissing-include-dirs -- -Wmissing-noreturn -Wnested-externs -Wpointer-arith -+ -Wmissing-noreturn -Wpointer-arith - -Wundef -Wwrite-strings") - AC_SUBST(WARNING_FLAGS) - diff --git a/evolution-ews-3.3.2.tar.bz2 b/evolution-ews-3.3.2.tar.bz2 deleted file mode 100644 index 08d36c3..0000000 --- a/evolution-ews-3.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f967f3ec2ab57dfe8d56e230fb45428a71d60d60128a319676cea2a73b9c2f21 -size 474715 diff --git a/evolution-ews-3.3.3.tar.xz b/evolution-ews-3.3.3.tar.xz new file mode 100644 index 0000000..60e9533 --- /dev/null +++ b/evolution-ews-3.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23ce40fbf6bc3df890177bde28003778cc3c7ec76253ae24b774289bd718c38c +size 404368 diff --git a/evolution-ews.changes b/evolution-ews.changes index 3eff920..edefb33 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -1,13 +1,34 @@ +------------------------------------------------------------------- +Tue Dec 20 13:41:56 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Fix address-book to display contents without error. + + Implement GetFolder request. + + Remove all *_DISABLE_DEPRECATED_FLAGS. + + Remove GSEAL_ENABLE macro. + + Bugs fixed: + - bgo#656376: Support for delegation + - bgo#664637: Deleted messages appear in Inbox + - bgo#648877, bgo#654940, bgo#659679, bgo#661537, bgo#663379, + bgo#664116, bgo#664572, bgo#665065. + + 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. +- Drop change-compiler-flag-dimstar.patch: fixed upstream. Also + remove gnome-common BuildRequires and call to gnome-autogen.sh + that were needed for the patch. + ------------------------------------------------------------------- Mon Nov 21 08:41:16 UTC 2011 - dimstar@opensuse.org - Update to version 3.3.2: + Remove g_thread_init() calls. - + Distribute 'xz' tar archives instead of gzip. - + Fix default-enable of AM_MAINTAINER_MODE + Do not use deprecated g_atexit. + Bugs fixed: bgo#657320, bgo#661528, bgo#661972, bgo#662598. + Updated translations. +- Changes from version 3.3.1.1: + + Work around libgthread shenanigans in GLib 2.31. - Changes from version 3.3.1: + Adapt to various API changes. + Prefill Host URL when creating new account @@ -16,24 +37,7 @@ Mon Nov 21 08:41:16 UTC 2011 - dimstar@opensuse.org + Updated translations. - Enhance change-compiler-flag-dimstar.patch: Remove usage of G_DISABLE_DEPRECATED from the build. - -------------------------------------------------------------------- -Wed Nov 16 15:26:56 UTC 2011 - dimstar@opensuse.org - -- Update to version 3.3.1.1: - + Work around libgthread shenanigans in GLib 2.31. - -------------------------------------------------------------------- -Wed Oct 26 19:39:56 UTC 2011 - dimstar@opensuse.org - -- Update to version 3.3.1: - + Adapt to various API changes. - + Prefill Host URL when creating new account. - * Use SHA256 of EWS ItemId for cache filename, not the ItemId - itself. - + Updated translations. - Drop base-version-changed.patch: fixed upstream. -- Rebase change-compiler-flag-dimstar.patch. ------------------------------------------------------------------- Fri Oct 14 12:44:28 UTC 2011 - vuntz@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index 1462c8e..431ab94 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -15,24 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: evolution-ews # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.4 -Version: 3.3.2 -Release: 1 -License: LGPLv2.1 +Version: 3.3.3 +Release: 0 Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later -Url: http://projects.gnome.org/evolution/ +License: LGPL-2.1 Group: Productivity/Networking/Email/Clients -Source: http://download.gnome.org/sources/evolution-ews/3.3/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE change-compiler-flag-dimstar.patch -- Temporary hack to fix build -Patch1: change-compiler-flag-dimstar.patch +Url: http://projects.gnome.org/evolution/ +Source: http://download.gnome.org/sources/evolution-ews/3.3/%{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(evolution-data-server-1.2) BuildRequires: pkgconfig(evolution-plugin-3.0) BuildRequires: pkgconfig(evolution-shell-3.0) @@ -98,10 +95,8 @@ later). %prep %setup -q translation-update-upstream -%patch1 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh %{configure} \ --disable-static make %{?_smp_mflags}