[packages/glabels] - up to 3.2.1

[baggins]

commit 9bc5554cdae37eb075764e7992e376ee59bbf1cd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 28 23:11:07 2015 +0100

    - up to 3.2.1

 eds-3.6.patch | 72 -----------------------------------------------------------
 glabels.spec  | 10 ++++-----
 2 files changed, 4 insertions(+), 78 deletions(-)
---
diff --git a/glabels.spec b/glabels.spec
index 6893f2d..23ed6e6 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,14 +1,13 @@
 Summary:	gLabels - a GNOME program to create labels and business cards
 Summary(pl.UTF-8):	gLabels - program dla GNOME do tworzenia etykiet i wizytówek
 Name:		glabels
-Version:	3.0.1
-Release:	3
+Version:	3.2.1
+Release:	1
 License:	GPL v3
 Group:		X11/Applications/Graphics
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glabels/3.0/%{name}-%{version}.tar.xz
-# Source0-md5:	21abcdb6f812f03c628fdc77adfc0573
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glabels/3.2/%{name}-%{version}.tar.xz
+# Source0-md5:	95e0d6f833615ed00b82970dfe28c0fe
 Patch0:		%{name}-link.patch
-Patch1:		eds-3.6.patch
 URL:		http://www.glabels.org/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
@@ -107,7 +106,6 @@ Dokumentacja API biblioteki glabels.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__glib_gettextize}
diff --git a/eds-3.6.patch b/eds-3.6.patch
deleted file mode 100644
index 161042b..0000000
--- a/eds-3.6.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c
---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200
-@@ -29,7 +29,7 @@
- 
- #include "merge-evolution.h"
- 
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon
- /*--------------------------------------------------------------------------*/
- /* Open merge source.                                                       */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+   ESourceRegistry *registry;
-+   EBook *book = NULL;
-+   ESource *source;
-+
-+   registry = e_source_registry_new_sync (NULL, error);
-+   if (!registry)
-+       return NULL;
-+
-+   source = e_source_registry_ref_builtin_address_book (registry);
-+   if (!source) {
-+       g_object_unref (registry);
-+       return NULL;
-+   }
-+
-+   book = e_book_new (source, error);
-+
-+   g_object_unref (source);
-+   g_object_unref (registry);
-+
-+   return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
-                 return;
-         }
- 
--        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+        merge_evolution->priv->book = gl_open_system_addressbook(&error);
-         if (!merge_evolution->priv->book) {
-                 g_warning ("Couldn't open addressbook.");
-                 if (error)
-                 {
--                        g_warning ("e_book_new_system_addressbook: %s", error->message);
-+                        g_warning ("gl_open_system_addressbook: %s", error->message);
-                         g_error_free (error);
-                 }
-                 e_book_query_unref(query);
-diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c
---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200
-@@ -27,7 +27,7 @@
- 
- #include "merge-vcard.h"
- 
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glabels.git/commitdiff/9bc5554cdae37eb075764e7992e376ee59bbf1cd