- updated to 0.9.7

- updated tracker-1.0 patch
- added link patch (fix libsocialweb backend library linking)

diff --git a/folks-link.patch b/folks-link.patch
new file mode 100644 (file)
index 0000000..1c65745
--- /dev/null
+++ b/folks-link.patch
@@ -0,0 +1,11 @@
+--- folks-0.9.7/backends/libsocialweb/lib/Makefile.am.orig     2014-02-16 21:40:08.000000000 +0100
++++ folks-0.9.7/backends/libsocialweb/lib/Makefile.am  2014-06-22 09:29:22.687770584 +0200
+@@ -34,7 +34,7 @@
+       $(NULL)
+ 
+ libfolks_libsocialweb_la_LIBADD = \
+-      $(backend_library_LIBADD) \
++      $(backend_library_libadd) \
+       $(SW_CLIENT_LIBS) \
+       $(NULL)
+ 

diff --git a/folks-tracker-1.0.patch b/folks-tracker-1.0.patch
index 4fe5533653ffc586a3bcde27a326440a25f4723d..ad78bd8c360eb6977e3fd40b8136edd5b84e8d38 100644 (file)
--- a/folks-tracker-1.0.patch
+++ b/folks-tracker-1.0.patch
@@ -1,7 +1,6 @@
-diff -urN folks-0.9.6/configure.ac folks-0.9.6.new/configure.ac
---- folks-0.9.6/configure.ac   2013-11-06 17:35:50.000000000 +0100
-+++ folks-0.9.6.new/configure.ac       2014-03-30 22:22:01.988309549 +0200
-@@ -200,8 +200,8 @@
+--- folks-0.9.7/configure.ac.orig      2014-06-22 07:45:18.691234061 +0200
++++ folks-0.9.7/configure.ac   2014-06-22 07:46:23.097899383 +0200
+@@ -261,8 +261,8 @@
  GLIB_REQUIRED=2.38.2
  VALA_REQUIRED=0.22.0.28-9090
  VALADOC_REQUIRED=0.3.1
@@ -9,6 +8,6 @@ diff -urN folks-0.9.6/configure.ac folks-0.9.6.new/configure.ac
 -TRACKER_SPARQL_REQUIRED=0.15.2
 +TRACKER_SPARQL_MAJOR=1.0
 +TRACKER_SPARQL_REQUIRED=1.0
- EBOOK_REQUIRED=3.9.1
+ EBOOK_REQUIRED=3.8
+ EBOOK_REQUIRED_FOR_BLUEZ=3.9.1
  EDATASERVER_REQUIRED=3.5.3.1
- ZEITGEIST_REQUIRED=0.9.14

diff --git a/folks.spec b/folks.spec
index 4a7870e2bcec1ce6a78b8ad5b6755f2c910fd2c7..0139e007cc8fe0f1625c239d705e96d646a71716 100644 (file)
--- a/folks.spec
+++ b/folks.spec
@@ -5,21 +5,22 @@
 Summary:       GObject contact aggregation library
 Summary(pl.UTF-8):     Biblioteka GObject do agregowania kontaktów
 Name:          folks
-Version:       0.9.6
-Release:       2
+Version:       0.9.7
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/folks/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: c3759db485f9ac5fd6c28c47e89123b0
+# Source0-md5: aeaeb5a8e7277b167b9f055f372b9d5d
 Patch0:                %{name}-tracker-1.0.patch
+Patch1:                %{name}-link.patch
 URL:           https://live.gnome.org/Folks
 BuildRequires: autoconf >= 2.65
-BuildRequires: automake >= 1:1.11
+BuildRequires: automake >= 1:1.12
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: evolution-data-server-devel >= 3.9.1
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.38.2
+BuildRequires: glib2-devel >= 1:2.39.2
 BuildRequires: gobject-introspection-devel >= 1.30.0
 BuildRequires: intltool >= 0.50.0
 BuildRequires: libgee-devel >= 0.8.4
@@ -44,7 +45,7 @@ BuildRequires:        vala-tracker >= 1.0.0
 %endif
 BuildRequires: xz
 BuildRequires: zeitgeist-devel >= 0.9.14
-Requires:      glib2 >= 1:2.38.2
+Requires:      glib2 >= 1:2.39.2
 Requires:      libgee >= 0.8.4
 Requires:      evolution-data-server-libs >= 3.9.1
 Requires:      telepathy-glib >= 0.19.0
@@ -67,7 +68,7 @@ Summary(pl.UTF-8):    Pliki programistyczne bibliotek folks
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      evolution-data-server-devel >= 3.9.1
-Requires:      glib2-devel >= 1:2.38.2
+Requires:      glib2-devel >= 1:2.39.2
 Requires:      libgee-devel >= 0.8.4
 Requires:      libsocialweb-devel >= 0.25.20
 Requires:      telepathy-glib-devel >= 0.19.0
@@ -100,6 +101,7 @@ API folks dla języka Vala.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -140,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/folks-inspect
 %attr(755,root,root) %{_libdir}/libfolks.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfolks.so.25
+%attr(755,root,root) %{_libdir}/libfolks-dummy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfolks-dummy.so.25
 %attr(755,root,root) %{_libdir}/libfolks-eds.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfolks-eds.so.25
 %attr(755,root,root) %{_libdir}/libfolks-libsocialweb.so.*.*.*
@@ -149,44 +153,50 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfolks-tracker.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfolks-tracker.so.25
 %{_libdir}/girepository-1.0/Folks-0.6.typelib
+%{_libdir}/girepository-1.0/FolksDummy-0.6.typelib
 %{_libdir}/girepository-1.0/FolksEds-0.6.typelib
 %{_libdir}/girepository-1.0/FolksLibsocialweb-0.6.typelib
 %{_libdir}/girepository-1.0/FolksTelepathy-0.6.typelib
 %{_libdir}/girepository-1.0/FolksTracker-0.6.typelib
 %dir %{_libdir}/folks
-%dir %{_libdir}/folks/41
-%dir %{_libdir}/folks/41/backends
-%dir %{_libdir}/folks/41/backends/bluez
-%attr(755,root,root) %{_libdir}/folks/41/backends/bluez/bluez.so
-%dir %{_libdir}/folks/41/backends/eds
-%attr(755,root,root) %{_libdir}/folks/41/backends/eds/eds.so
-%dir %{_libdir}/folks/41/backends/key-file
-%attr(755,root,root) %{_libdir}/folks/41/backends/key-file/key-file.so
-%dir %{_libdir}/folks/41/backends/libsocialweb
-%attr(755,root,root) %{_libdir}/folks/41/backends/libsocialweb/libsocialweb.so
-%dir %{_libdir}/folks/41/backends/ofono
-%attr(755,root,root) %{_libdir}/folks/41/backends/ofono/ofono.so
-%dir %{_libdir}/folks/41/backends/telepathy
-%attr(755,root,root) %{_libdir}/folks/41/backends/telepathy/telepathy.so
-%dir %{_libdir}/folks/41/backends/tracker
-%attr(755,root,root) %{_libdir}/folks/41/backends/tracker/tracker.so
+%dir %{_libdir}/folks/42
+%dir %{_libdir}/folks/42/backends
+%dir %{_libdir}/folks/42/backends/bluez
+%attr(755,root,root) %{_libdir}/folks/42/backends/bluez/bluez.so
+%dir %{_libdir}/folks/42/backends/dummy
+%attr(755,root,root) %{_libdir}/folks/42/backends/dummy/dummy.so
+%dir %{_libdir}/folks/42/backends/eds
+%attr(755,root,root) %{_libdir}/folks/42/backends/eds/eds.so
+%dir %{_libdir}/folks/42/backends/key-file
+%attr(755,root,root) %{_libdir}/folks/42/backends/key-file/key-file.so
+%dir %{_libdir}/folks/42/backends/libsocialweb
+%attr(755,root,root) %{_libdir}/folks/42/backends/libsocialweb/libsocialweb.so
+%dir %{_libdir}/folks/42/backends/ofono
+%attr(755,root,root) %{_libdir}/folks/42/backends/ofono/ofono.so
+%dir %{_libdir}/folks/42/backends/telepathy
+%attr(755,root,root) %{_libdir}/folks/42/backends/telepathy/telepathy.so
+%dir %{_libdir}/folks/42/backends/tracker
+%attr(755,root,root) %{_libdir}/folks/42/backends/tracker/tracker.so
 %{_datadir}/GConf/gsettings/folks.convert
 %{_datadir}/glib-2.0/schemas/org.freedesktop.folks.gschema.xml
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfolks.so
+%attr(755,root,root) %{_libdir}/libfolks-dummy.so
 %attr(755,root,root) %{_libdir}/libfolks-eds.so
 %attr(755,root,root) %{_libdir}/libfolks-libsocialweb.so
 %attr(755,root,root) %{_libdir}/libfolks-telepathy.so
 %attr(755,root,root) %{_libdir}/libfolks-tracker.so
 %{_datadir}/gir-1.0/Folks-0.6.gir
+%{_datadir}/gir-1.0/FolksDummy-0.6.gir
 %{_datadir}/gir-1.0/FolksEds-0.6.gir
 %{_datadir}/gir-1.0/FolksLibsocialweb-0.6.gir
 %{_datadir}/gir-1.0/FolksTelepathy-0.6.gir
 %{_datadir}/gir-1.0/FolksTracker-0.6.gir
 %{_includedir}/folks
 %{_pkgconfigdir}/folks.pc
+%{_pkgconfigdir}/folks-dummy.pc
 %{_pkgconfigdir}/folks-eds.pc
 %{_pkgconfigdir}/folks-libsocialweb.pc
 %{_pkgconfigdir}/folks-telepathy.pc
@@ -197,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/folks.deps
 %{_datadir}/vala/vapi/folks.vapi
+%{_datadir}/vala/vapi/folks-dummy.deps
+%{_datadir}/vala/vapi/folks-dummy.vapi
 %{_datadir}/vala/vapi/folks-eds.deps
 %{_datadir}/vala/vapi/folks-eds.vapi
 %{_datadir}/vala/vapi/folks-libsocialweb.deps