- updated to 0.6.3.2; merged changes from DEVEL

Changed files:
    folks.spec -> 1.12

diff --git a/folks.spec b/folks.spec
index 393a1158f7a83716133eed3bb660d9be61bbfc04..dd2aeca4a2acac4e12023f2d081fa0c5afd6c655 100644 (file)
--- a/folks.spec
+++ b/folks.spec
@@ -1,25 +1,32 @@
 Summary:       GObject contact aggregation library
 Name:          folks
-Version:       0.5.2
+Version:       0.6.3.2
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/folks/0.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 78c5807148721a5e316fa54b436d2918
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/folks/0.6/%{name}-%{version}.tar.xz
+# Source0-md5: 43ed35e822a79c7acf17db885422e266
 URL:           http://telepathy.freedesktop.org/wiki/Folks
 BuildRequires: GConf2-devel >= 2.31.0
+BuildRequires: autoconf >= 2.65
+BuildRequires: automake >= 1:1.11
 BuildRequires: dbus-glib-devel
+BuildRequires: evolution-data-server-devel >= 3.2.0
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.24.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libgee-devel < 0.7
 BuildRequires: libsocialweb-devel >= 0.25.15-2
+BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig >= 1:0.21
 BuildRequires: readline-devel
-BuildRequires: telepathy-glib-devel >= 0.13.1
-BuildRequires: vala >= 2:0.12.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: telepathy-glib-devel >= 0.14.0
+BuildRequires: tracker-devel >= 0.12.0
+BuildRequires: vala >= 2:0.14.0
+BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,9 +39,12 @@ Summary:     Development files for folks libraries
 Summary(pl.UTF-8):     Pliki programistyczne bibliotek folks
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      evolution-data-server-devel >= 3.2.0
 Requires:      glib2-devel >= 1:2.24.0
 Requires:      libgee-devel < 0.7
-Requires:      telepathy-glib-devel >= 0.13.1
+Requires:      libsocialweb-devel >= 0.25.15-2
+Requires:      telepathy-glib-devel >= 0.14.0
+Requires:      tracker-devel >= 0.12.0
 
 %description devel
 Development files for folks libraries.
@@ -46,6 +56,12 @@ Pliki programistyczne bibliotek folks.
 %setup -q
 
 %build
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-silent-rules \
        --disable-static \
@@ -59,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/folks/*/backends/*/libfolks-backend-*.la \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/folks/*/backends/*/*.la \
        $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
@@ -76,35 +92,43 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/folks-import
 %attr(755,root,root) %{_bindir}/folks-inspect
 %attr(755,root,root) %{_libdir}/libfolks.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks.so.24
-%attr(755,root,root) %{_libdir}/libfolks-telepathy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks-telepathy.so.24
+%attr(755,root,root) %ghost %{_libdir}/libfolks.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.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfolks-libsocialweb.so.24
+%attr(755,root,root) %ghost %{_libdir}/libfolks-libsocialweb.so.25
+%attr(755,root,root) %{_libdir}/libfolks-telepathy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfolks-telepathy.so.25
 %dir %{_libdir}/folks
-%dir %{_libdir}/folks/24
-%dir %{_libdir}/folks/24/backends
-%dir %{_libdir}/folks/24/backends/key-file
-%attr(755,root,root) %{_libdir}/folks/24/backends/key-file/libfolks-backend-key-file.so
-%dir %{_libdir}/folks/24/backends/libsocialweb
-%attr(755,root,root) %{_libdir}/folks/24/backends/libsocialweb/libfolks-backend-libsocialweb.so
-%dir %{_libdir}/folks/24/backends/telepathy
-%attr(755,root,root) %{_libdir}/folks/24/backends/telepathy/libfolks-backend-telepathy.so
+%dir %{_libdir}/folks/27
+%dir %{_libdir}/folks/27/backends
+%dir %{_libdir}/folks/27/backends/eds
+%attr(755,root,root) %{_libdir}/folks/27/backends/eds/eds.so
+%dir %{_libdir}/folks/27/backends/key-file
+%attr(755,root,root) %{_libdir}/folks/27/backends/key-file/key-file.so
+%dir %{_libdir}/folks/27/backends/libsocialweb
+%attr(755,root,root) %{_libdir}/folks/27/backends/libsocialweb/libsocialweb.so
+%dir %{_libdir}/folks/27/backends/telepathy
+%attr(755,root,root) %{_libdir}/folks/27/backends/telepathy/telepathy.so
 %{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfolks.so
-%attr(755,root,root) %{_libdir}/libfolks-telepathy.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
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/vala/vapi/folks.deps
 %{_datadir}/vala/vapi/folks.vapi
+%{_datadir}/vala/vapi/folks-eds.deps
+%{_datadir}/vala/vapi/folks-eds.vapi
 %{_datadir}/vala/vapi/folks-libsocialweb.deps
 %{_datadir}/vala/vapi/folks-libsocialweb.vapi
 %{_datadir}/vala/vapi/folks-telepathy.deps
 %{_datadir}/vala/vapi/folks-telepathy.vapi
 %{_includedir}/folks
 %{_pkgconfigdir}/folks.pc
-%{_pkgconfigdir}/folks-telepathy.pc
+%{_pkgconfigdir}/folks-eds.pc
 %{_pkgconfigdir}/folks-libsocialweb.pc
+%{_pkgconfigdir}/folks-telepathy.pc