From 4f7c7a5cb0d7aa45144f57ead2452bd9ad5806e7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:50:48 +0000 Subject: import gnome-contacts-3.14.2-2.el7 --- diff --git a/.gitignore b/.gitignore index 82a3686..fc60186 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-contacts-3.8.2.tar.xz +SOURCES/gnome-contacts-3.14.2.tar.xz diff --git a/.gnome-contacts.metadata b/.gnome-contacts.metadata index 62109e9..dff7b5b 100644 --- a/.gnome-contacts.metadata +++ b/.gnome-contacts.metadata @@ -1 +1 @@ -bab2dd24f143def00c1cd0764fb4e4d20d3d975c SOURCES/gnome-contacts-3.8.2.tar.xz +05962e086bbfbe7e0a2c8f1b70953fc6a4e81fda SOURCES/gnome-contacts-3.14.2.tar.xz diff --git a/SOURCES/0001-Add-a-man-page.patch b/SOURCES/0001-Add-a-man-page.patch deleted file mode 100644 index 9ab0517..0000000 --- a/SOURCES/0001-Add-a-man-page.patch +++ /dev/null @@ -1,171 +0,0 @@ -From eddd43232a4930a807f4cc24ead713f4b11902cf Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Tue, 2 Jul 2013 11:27:48 -0400 -Subject: [PATCH 1/3] Add a man page - -This is admittedly pretty minimal. - -https://bugzilla.gnome.org/show_bug.cgi?id=703470 ---- - Makefile.am | 5 ++++ - configure.ac | 18 ++++++++++++++ - man/Makefile.am | 21 ++++++++++++++++ - man/gnome-contacts.xml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 110 insertions(+) - create mode 100644 man/Makefile.am - create mode 100644 man/gnome-contacts.xml - -diff --git a/Makefile.am b/Makefile.am -index 40ae6c7..d3a82a5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,11 @@ - ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} - NULL= - SUBDIRS = libgd src vapi data po -+if BUILD_MAN_PAGES -+SUBDIRS += man -+endif -+DIST_SUBDIRS = libgd src vapi data po man -+ - EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ -diff --git a/configure.ac b/configure.ac -index 58b8f96..a17321c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,6 +11,7 @@ AC_CONFIG_FILES([Makefile - libgd/Makefile - vapi/Makefile - src/Makefile -+ man/Makefile - data/Makefile - po/Makefile.in - data/gnome-contacts.desktop.in -@@ -77,6 +78,23 @@ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` - AC_SUBST(GLIB_COMPILE_RESOURCES) - -+################# -+# Documentation # -+################# -+ -+AC_ARG_ENABLE(man-pages, -+ AC_HELP_STRING([--enable-man-pages], -+ [build man pages]),, -+ enable_documentation=yes) -+if test x$enable_man_pages = xyes; then -+ AC_PATH_PROG([XSLTPROC], [xsltproc]) -+ if test x$XSLTPROC = x; then -+ AC_MSG_ERROR([xsltproc is required to build man pages]) -+ fi -+fi -+AM_CONDITIONAL(BUILD_MAN_PAGES, test x$enable_man_pages = xyes) -+ -+ - dnl libgd - LIBGD_INIT([ - gtk-hacks -diff --git a/man/Makefile.am b/man/Makefile.am -new file mode 100644 -index 0000000..182800d ---- /dev/null -+++ b/man/Makefile.am -@@ -0,0 +1,21 @@ -+XSLTPROC_FLAGS = \ -+ --nonet \ -+ --stringparam man.output.quietly 1 \ -+ --stringparam funcsynopsis.style ansi \ -+ --stringparam man.th.extra1.suppress 1 \ -+ --stringparam man.authors.section.enabled 0 \ -+ --stringparam man.copyright.section.enabled 0 -+ -+.xml.1: -+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -+ -+man_MANS = \ -+ gnome-contacts.1 -+ -+xml_files = $(man_MANS:.1=.xml) -+ -+EXTRA_DIST = $(xml_files) -+ -+DISTCLEANFILES = $(man_MANS) -+ -+-include $(top_srcdir)/git.mk -diff --git a/man/gnome-contacts.xml b/man/gnome-contacts.xml -new file mode 100644 -index 0000000..7a3bd20 ---- /dev/null -+++ b/man/gnome-contacts.xml -@@ -0,0 +1,66 @@ -+ -+ -+ -+ -+ -+ -+ gnome-contacts -+ GNOME -+ -+ -+ -+ Maintainer -+ Alexander -+ Larsson -+ alexl@redhat.com -+ -+ -+ -+ -+ -+ -+ gnome-contacts -+ 1 -+ User Commands -+ -+ -+ -+ gnome-contacts -+ Access and store information about contacts -+ -+ -+ -+ -+ gnome-contacts OPTION -+ -+ -+ -+ -+ Description -+ -+ gnome-contacts is a graphical -+ user interface to access and store information about -+ your contacts. -+ -+ gnome-contacts uses the folks library to pull -+ together contact information from various sources, -+ including telepathy, evolution-data-server, your -+ configured GNOME online accounts, etc. -+ -+ -+ -+ Options -+ -+ -+ -+ , -+ -+ Prints a short help -+ text and exits. -+ -+ -+ -+ -+ -+ --- -1.8.3.1 - diff --git a/SOURCES/gnome-contacts-3.8.2-show-address-fields.patch b/SOURCES/gnome-contacts-3.8.2-show-address-fields.patch deleted file mode 100644 index f7b3c74..0000000 --- a/SOURCES/gnome-contacts-3.8.2-show-address-fields.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 23ba9b75ee77fc3eebfec7daffef9310063b3fb0 Mon Sep 17 00:00:00 2001 -From: David King -Date: Wed, 17 Dec 2014 14:25:17 +0000 -Subject: [PATCH] Show address fields when adding the first contact - -The new contact dialog iterates over the list of address fields, which -are declared as static in the Contact class. Static data in Vala is -implemented by initializing the data during class_init(), or in other -words, the first time that the class is instantiated. When adding the -first contact, there are no instances of Contact, and so the address -fields have not been initialized. This leads to a blank space in the new -contact dialog, where the list of address fields should be. - -Ensure that class_init() of the Contact class has been called by -calling g_type_class_ref() on the Type before iterating over the address -fields. - -https://bugzilla.gnome.org/show_bug.cgi?id=702810 ---- - src/contacts-new-contact-dialog.vala | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/contacts-new-contact-dialog.vala b/src/contacts-new-contact-dialog.vala -index 816c863..c98f305 100644 ---- a/src/contacts-new-contact-dialog.vala -+++ b/src/contacts-new-contact-dialog.vala -@@ -176,6 +176,14 @@ public class Contacts.NewContactDialog : Dialog { - sub_grid.set_hexpand (true); - entries.add (sub_grid); - -+ /* Ensure that class_init() of Contact has been called, to initialize the -+ * static members, including postal_element_props. */ -+ var contact_type = Type.from_name ("ContactsContact"); -+ if (contact_type != 0) { -+ // Type has been registered, make sure that class_init() has been called. -+ contact_type.class_ref (); -+ } -+ - for (int i = 0; i < Contact.postal_element_props.length; i++) { - var entry = new Entry (); - entry.set ("placeholder-text", Contact.postal_element_names[i]); --- -1.8.3.1 - diff --git a/SOURCES/gnome-contacts-desktop-file-keywords.patch b/SOURCES/gnome-contacts-desktop-file-keywords.patch new file mode 100644 index 0000000..b884342 --- /dev/null +++ b/SOURCES/gnome-contacts-desktop-file-keywords.patch @@ -0,0 +1,13 @@ +diff --git a/po/ne.po b/po/ne.po +index deeaa8e..6ad8ae7 100644 +--- a/po/ne.po ++++ b/po/ne.po +@@ -44,7 +44,7 @@ msgstr "जिनोमको लागि एक समपर्क प्र + + #: ../data/org.gnome.Contacts.desktop.in.in.h:3 + msgid "friends;address book;" +-msgstr "मित्र;ठेगाना पूस्तिका" ++msgstr "मित्र;ठेगाना;पूस्तिका;" + + #: ../src/contacts-accounts-list.vala:48 + msgid "Online Accounts" diff --git a/SPECS/gnome-contacts.spec b/SPECS/gnome-contacts.spec index 439ad35..18dd382 100644 --- a/SPECS/gnome-contacts.spec +++ b/SPECS/gnome-contacts.spec @@ -1,33 +1,29 @@ +%global gtk3_version 3.12.0 + Name: gnome-contacts -Version: 3.8.2 -Release: 6%{?dist} +Version: 3.14.2 +Release: 2%{?dist} Summary: Contacts manager for GNOME License: GPLv2+ URL: https://live.gnome.org/Design/Apps/Contacts #VCS: http://git.gnome.org/browse/gnome-contacts/ -Source0: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz - -# upstream fix -Patch0: 0001-Add-a-man-page.patch +Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1053654 -# https://bugzilla.gnome.org/show_bug.cgi?id=702810 -Patch1: gnome-contacts-3.8.2-show-address-fields.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=736791 +Patch0: gnome-contacts-desktop-file-keywords.patch BuildRequires: folks-devel -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: vala-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: gnome-desktop3-devel BuildRequires: desktop-file-utils BuildRequires: cheese-libs-devel +BuildRequires: vala-tools -# for patch0 -BuildRequires: autoconf automake libtool intltool -BuildRequires: docbook-style-xsl -BuildRequires: libxslt +Requires: gtk3%{?_isa} >= %{gtk3_version} Obsoletes: contacts <= 0.12 Provides: contacts @@ -38,18 +34,14 @@ Provides: contacts %prep %setup -q %patch0 -p1 -%patch1 -p1 - -autoreconf -i -f -intltoolize -f %build -%configure --enable-man-pages +%configure make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Contacts.desktop %find_lang %{name} %postun @@ -64,17 +56,26 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %doc AUTHORS COPYING README NEWS %{_bindir}/%{name} %{_libexecdir}/gnome-contacts-search-provider -%{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/org.gnome.Contacts.appdata.xml +%{_datadir}/applications/org.gnome.Contacts.desktop +%{_datadir}/dbus-1/services/org.gnome.Contacts.service %{_datadir}/dbus-1/services/org.gnome.Contacts.SearchProvider.service %{_datadir}/glib-2.0/schemas/org.gnome.Contacts.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Contacts.gschema.xml %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers -%{_datadir}/gnome-shell/search-providers/gnome-contacts-search-provider.ini -%{_mandir}/man1/gnome-contacts.1.gz +%{_datadir}/gnome-shell/search-providers/org.gnome.Contacts.search-provider.ini %changelog +* Thu May 21 2015 Matthias Clasen - 3.14.2-2 +- Rebuild against new gnome-desktop3 +Related: #1174711 + +* Mon Mar 23 2015 Richard Hughes - 3.14.2-1 +- Update to 3.14.2 +- Resolves: #1174711 + * Wed Dec 17 2014 David King - 3.8.2-6 - Fix display of address fields when adding the first contact (#1053654)