Hello community, here is the log from the commit of package folks for openSUSE:Factory checked in at 2017-09-13 21:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/folks (Old) and /work/SRC/openSUSE:Factory/.folks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "folks" Wed Sep 13 21:44:47 2017 rev:44 rq:522439 version:0.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/folks/folks.changes 2017-07-08 12:27:02.700695753 +0200 +++ /work/SRC/openSUSE:Factory/.folks.new/folks.changes 2017-09-13 21:44:48.548006735 +0200 @@ -1,0 +2,14 @@ +Fri Sep 8 16:01:43 UTC 2017 - [email protected] + +- Update summaries. Trim %if/%endif markers for package + declarations that are idempotent. + +------------------------------------------------------------------- +Fri Jul 21 18:11:01 UTC 2017 - [email protected] + +- Replace pkgconfig(tracker-sparql-1.0) with + pkgconfig(tracker-sparql-2.0) BuildRequires. +- Add folks-tracker.2.0.patch: Reference Tracker-2.0 from the .gir + file. + +------------------------------------------------------------------- New: ---- folks-tracker.2.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folks.spec ++++++ --- /var/tmp/diff_new_pack.a4aLxN/_old 2017-09-13 21:44:49.135924020 +0200 +++ /var/tmp/diff_new_pack.a4aLxN/_new 2017-09-13 21:44:49.139923457 +0200 @@ -19,23 +19,24 @@ %define soversion 25 %define module_version 43 %define with_zeitgeist 0 - %if 0%{?suse_version} < 1315 %bcond_without libsocialweb %else %bcond_with libsocialweb %endif - Name: folks Version: 0.11.4 Release: 0 Summary: Library to create metacontacts from multiple sources License: LGPL-2.1+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: http://telepathy.freedesktop.org/wiki/Folks Source: http://download.gnome.org/sources/folks/0.11/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM folks-tracker.2.0.patch [email protected] -- Switch to tracker version 2.0, patch not upstream-ready +Patch0: folks-tracker.2.0.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool >= 0.50.0 +BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: vala >= 0.22.0.28 BuildRequires: pkgconfig(dbus-glib-1) @@ -44,171 +45,169 @@ BuildRequires: pkgconfig(libebook-1.2) >= 3.13.90 BuildRequires: pkgconfig(libebook-contacts-1.2) >= 3.7.90 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.13.90 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(telepathy-glib) >= 0.19.9 +BuildRequires: pkgconfig(tracker-sparql-2.0) %if %{with libsocialweb} BuildRequires: pkgconfig(libsocialweb-client) >= 0.25.20 %endif -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(telepathy-glib) >= 0.19.9 %if %{with_zeitgeist} BuildRequires: pkgconfig(zeitgeist-2.0) >= 0.9.14 %endif -BuildRequires: pkgconfig(tracker-sparql-1.0) %description -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. %package -n libfolks%{soversion} Summary: Library to create metacontacts from multiple sources # To make lang package installable -Group: System/Libraries -Provides: %{name} = %{version} # We assume that future -data packages remain backwards compatible +Group: System/Libraries Requires: libfolks-data >= %{version} Recommends: %{name}-lang +Provides: %{name} = %{version} %description -n libfolks%{soversion} -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. %package -n libfolks-data -Summary: Library to create metacontacts from multiple sources -- Data files +Summary: Data files for libfolks, a library to create metacontacts from many sources Group: System/Libraries %glib2_gsettings_schema_requires %description -n libfolks-data -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides mandatory data files for the library to work. %package -n typelib-1_0-Folks-0_6 -Summary: Library to create metacontacts from multiple sources -- Introspection bindings +Summary: Introspection bindings for libfolks Group: System/Libraries %description -n typelib-1_0-Folks-0_6 -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides the GObject Introspection bindings for libfolks. %package -n typelib-1_0-FolksEds-0_6 -Summary: Library to create metacontacts from multiple sources -- Introspection bindings +Summary: Introspection bindings for libfolks-eds Group: System/Libraries %description -n typelib-1_0-FolksEds-0_6 -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides the GObject Introspection bindings for libfolks. -%if %{with libsocialweb} %package -n typelib-1_0-FolksLibsocialweb-0_6 -Summary: Library to create metacontacts from multiple sources -- Introspection bindings +Summary: Introspection bindings for libfolks-libsocialweb Group: System/Libraries %description -n typelib-1_0-FolksLibsocialweb-0_6 -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides the GObject Introspection bindings for libfolks. -%endif %package -n typelib-1_0-FolksTelepathy-0_6 -Summary: Library to create metacontacts from multiple sources -- Introspection bindings +Summary: Introspection bindings for libfolks-telepathy Group: System/Libraries %description -n typelib-1_0-FolksTelepathy-0_6 -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides the GObject Introspection bindings for libfolks. %package -n typelib-1_0-FolksTracker-0_6 -Summary: Library to create metacontacts from multiple sources -- Introspection bindings +Summary: Introspection bindings for libfolks-tracker Group: System/Libraries %description -n typelib-1_0-FolksTracker-0_6 -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides the GObject Introspection bindings for libfolks. %package -n libfolks-eds%{soversion} -Summary: Library to create metacontacts from multiple sources -- EDS Backend +Summary: Evolution Data Server backend for libfolks Group: System/Libraries Supplements: packageand(libfolks%{soversion}:evolution-data-server) %description -n libfolks-eds%{soversion} -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. %package -n libfolks-tracker%{soversion} -Summary: Library to create metacontacts from multiple sources -- Tracker Backend +Summary: Tracker backend for libfolks Group: System/Libraries Supplements: packageand(libfolks%{soversion}:libtracker-sparql-1_0-0) %description -n libfolks-tracker%{soversion} -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. -%if %{with libsocialweb} %package -n libfolks-libsocialweb%{soversion} -Summary: Library to create metacontacts from multiple sources -- libsocialweb Backend +Summary: libsocialweb backend for libfolks Group: System/Libraries Supplements: packageand(libfolks%{soversion}:libsocialweb) %description -n libfolks-libsocialweb%{soversion} -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. -%endif %package -n libfolks-telepathy%{soversion} -Summary: Library to create metacontacts from multiple sources -- Telepathy Backend +Summary: Telepathy backend for libfolks Group: System/Libraries %description -n libfolks-telepathy%{soversion} -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. %package tools -Summary: Library to create metacontacts from multiple sources -- Tools +Summary: Additional utilities related to libfolks # the folks-import tool is useful for old pidgin users Group: Development/Libraries/GNOME Supplements: packageand(libfolks1:pidgin) %description tools -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. This package provides tools based on libfolks, like an importer for Pidgin metacontacts. %package devel -Summary: Library to create metacontacts from multiple sources -- Development Files +Summary: Development files for libfolks, a library to create metacontacts from many sources Group: Development/Libraries/GNOME Requires: libfolks%{soversion} = %{version} Requires: libfolks-eds%{soversion} = %{version} -%if %{with libsocialweb} -Requires: libfolks-libsocialweb%{soversion} = %{version} -%endif Requires: libfolks-telepathy%{soversion} = %{version} Requires: libfolks-tracker%{soversion} = %{version} Requires: typelib-1_0-Folks-0_6 = %{version} Requires: typelib-1_0-FolksEds-0_6 = %{version} +Requires: typelib-1_0-FolksTelepathy-0_6 = %{version} +Requires: typelib-1_0-FolksTracker-0_6 = %{version} +%if %{with libsocialweb} +Requires: libfolks-libsocialweb%{soversion} = %{version} +%endif %if %{with libsocialweb} Requires: typelib-1_0-FolksLibsocialweb-0_6 = %{version} %endif -Requires: typelib-1_0-FolksTelepathy-0_6 = %{version} -Requires: typelib-1_0-FolksTracker-0_6 = %{version} %description devel -libfolks is a library that aggregates people from multiple sources (eg, +libfolks is a library that aggregates people from multiple sources (e.g. Telepathy connection managers) to create metacontacts. %lang_package + %prep %setup -q +%patch0 -p1 %build %configure \ @@ -219,7 +218,7 @@ --disable-libsocialweb-backend \ %endif --disable-fatal-warnings -%__make %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 %install %makeinstall @@ -244,11 +243,9 @@ %postun -n libfolks-tracker%{soversion} -p /sbin/ldconfig -%if %{with libsocialweb} %post -n libfolks-libsocialweb%{soversion} -p /sbin/ldconfig %postun -n libfolks-libsocialweb%{soversion} -p /sbin/ldconfig -%endif %post -n libfolks-telepathy%{soversion} -p /sbin/ldconfig ++++++ folks-tracker.2.0.patch ++++++ Index: folks-0.11.4/backends/tracker/lib/FolksTracker-0.6.gir =================================================================== --- folks-0.11.4.orig/backends/tracker/lib/FolksTracker-0.6.gir +++ folks-0.11.4/backends/tracker/lib/FolksTracker-0.6.gir @@ -1,7 +1,7 @@ <?xml version="1.0"?> <repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0"; xmlns:c="http://www.gtk.org/introspection/c/1.0"; xmlns:glib="http://www.gtk.org/introspection/glib/1.0";> <include name="Folks" version="0.6"/> -<include name="Tracker" version="1.0"/> +<include name="Tracker" version="2.0"/> <include name="Gee" version="0.8"/> <include name="GObject" version="2.0"/> <package name="folks-tracker"/>
