Accepting request 85631 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/85631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=94

e-d-s-deprecated.patch

@@ -1,37 +0,0 @@
-Index: evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
-===================================================================
---- evolution-data-server-3.1.90.orig/libedataserver/e-data-server-util.c
-+++ evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
-@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *hay
- static gunichar
- stripped_char (gunichar ch)
- {
--	gunichar *decomp, retval;
-+#if GLIB_CHECK_VERSION(2,29,12)
-+	gunichar decomp[4];
-+#else
-+	gunichar *decomp;
-+#endif
-+	gunichar retval;
- 	GUnicodeType utype;
- 	gsize dlen;
- 
-@@ -268,11 +273,18 @@ stripped_char (gunichar ch)
- 		/* Convert to lowercase, fall through */
- 		ch = g_unichar_tolower (ch);
- 	case G_UNICODE_LOWERCASE_LETTER:
-+#if GLIB_CHECK_VERSION(2,29,12)
-+		if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
-+			retval = decomp[0];
-+			return retval;
-+		}
-+#else
- 		if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
- 			retval = decomp[0];
- 			g_free (decomp);
- 			return retval;
- 		}
-+#endif
- 		break;
- 	}
- 

evolution-data-server-3.1.91.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d133d7de1cb2d5ca87b5de67048f01a47465a8f36e9a3a44f00f4eb8147ce8a
-size 4593908

evolution-data-server-3.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4889211ee740db610a3493202ddd583f1263698cd6cee7ff44ecab619db63000
+size 4605325

evolution-data-server.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Sun Sep 25 23:03:14 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.2.0:
+  + google: Handle multivalue custom vcard attributes
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Sep 21 18:01:38 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.92:
+  + Handle changes in the goa accounts list at runtime
+  + imapx: Fix read of uninitialized memory from g_str_has_prefix
+  + Various other code changes.
+  + Bugs fixed: bgo#659282, bgo#659184, bgo#659079, bgo#659165,
+    bgo#655253, bgo#632153, bgo#658911, bgo#655728, bgo#655837,
+    bgo#654818,
+  + Updated translations.
+- Drop e-d-s-deprecated.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant/obsolete tags/sections from specfile
+  (cf. packaging guidelines)
+- Use %_smp_mflags for parallel build
+
 -------------------------------------------------------------------
 Sun Sep  4 16:25:26 UTC 2011 - vuntz@opensuse.org
 

evolution-data-server.spec

@@ -33,15 +33,12 @@ Name:           evolution-data-server
 %define _evo_version 3.2
 License:        LGPLv2+
 Group:          Development/Libraries/GNOME
-Version:        3.1.91
+Version:        3.2.0
 Release:        1
-# FIXME: parallel build is broken in 3.1.3, check in later versions if this works
 Summary:        Evolution Data Server
 Url:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/evolution-data-server/3.2/%{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM e-d-s-deprecated.patch bgo#655837 dimstar@opensuse.org -- g_unicode_canonical_decomposition is deprecated.
-Patch0:         e-d-s-deprecated.patch
 BuildRequires:  bison
 BuildRequires:  db-devel
 %if %USE_EVOLDAP
@@ -92,8 +89,6 @@ Evolution Data Server provides a central location for your address book
 and calendar in the GNOME Desktop.
 
 %package -n libcamel-1_2-%{so_camel}
-
-
 Summary:        Evolution Data Server - Messaging Library
 Group:          System/Libraries
 
@@ -104,8 +99,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library for messaging.
 
 %package -n libebackend-1_2-%{so_ebackend}
-
-
 Summary:        Evolution Data Server - Backend Utilities Library
 Group:          System/Libraries
 
@@ -116,8 +109,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library for backends.
 
 %package -n libebook-1_2-%{so_ebook}
-
-
 Summary:        Evolution Data Server - Address Book Client Library
 Group:          System/Libraries
 
@@ -128,8 +119,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library to access address books.
 
 %package -n libecal-1_2-%{so_ecal}
-
-
 Summary:        Evolution Data Server - Calendar Client Library
 Group:          System/Libraries
 
@@ -140,8 +129,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library to access calendars.
 
 %package -n libedata-book-1_2-%{so_edata_book}
-
-
 Summary:        Evolution Data Server - Address Book Backend Library
 Group:          System/Libraries
 
@@ -152,8 +139,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library for address book backends.
 
 %package -n libedata-cal-1_2-%{so_edata_cal}
-
-
 Summary:        Evolution Data Server - Calendar Backend Library
 Group:          System/Libraries
 
@@ -164,8 +149,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library for calendar backends.
 
 %package -n libedataserver-1_2-%{so_edataserver}
-
-
 Summary:        Evolution Data Server - Utilities Library
 Group:          System/Libraries
 
@@ -176,8 +159,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library.
 
 %package -n libedataserverui-3_0-%{so_edataserverui}
-
-
 Summary:        Evolution Data Server - Graphical Utilities Library
 Group:          System/Libraries
 
@@ -227,7 +208,6 @@ This package contains developer documentation.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build
@@ -245,8 +225,7 @@ translation-update-upstream
     --enable-nntp=yes \
     --enable-vala-bindings \
     --disable-static
-#make %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1
-make
 
 %install
 %{makeinstall}
@@ -265,9 +244,6 @@ find %{buildroot} -name '*.la' -type f -delete -print
 %endif
 %fdupes %{buildroot}
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %post -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig
 
 %postun -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig