Update to 3.12.1

[packages/gnome-online-accounts.git] / gnome-online-accounts.spec

diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec
index b0fe94f99873a9e6bb2a49994b1fdd82570a708b..498c641a5b5334dab414b93af4e35fba53ac6715 100644 (file)
--- a/gnome-online-accounts.spec
+++ b/gnome-online-accounts.spec
@@ -1,52 +1,56 @@
 #
 # Conditional build:
-%bcond_with    kerberos5       # Kerberos 5 support [TODO: heimdal vs MIT]
+%bcond_with    kerberos5       # Kerberos 5 support [TODO: heimdal support; needs MIT currently]
+%bcond_with    uoa             # single sign-on (aka Ubuntu Online Accounts) in TPAW
 
 Summary:       Provide online accounts information
 Summary(pl.UTF-8):     Dostarczanie informacji o kontach w serwisach sieciowych
 Name:          gnome-online-accounts
-Version:       3.8.3
+Version:       3.12.1
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-online-accounts/3.8/%{name}-%{version}.tar.xz
-# Source0-md5: b22cac719544e9dabb1adcb288439fbb
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-online-accounts/3.12/%{name}-%{version}.tar.xz
+# Source0-md5: 729cb9ccbc83fceb1ce2e1808dd10b74
+Patch0:                %{name}-link.patch
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.9
+BuildRequires: automake >= 1:1.11
+BuildRequires: dbus-glib-devel
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: gnome-common
 BuildRequires: gnome-doc-utils >= 0.12.1
 BuildRequires: gobject-introspection-devel >= 0.6.2
-BuildRequires: gtk+3-devel >= 3.6.0
+BuildRequires: gtk+3-devel >= 3.12.0
 BuildRequires: gtk-doc >= 1.3
-BuildRequires: gtk-webkit3-devel
-BuildRequires: intltool >= 0.40.1
+BuildRequires: gtk-webkit3-devel >= 2.2.0
+BuildRequires: intltool >= 0.50.0
 BuildRequires: json-glib-devel
-BuildRequires: libgnome-keyring-devel
-BuildRequires: libnotify-devel >= 0.7
-BuildRequires: libsecret-devel
+%{?with_uoa:BuildRequires:     libaccount-plugin-devel}
+%{?with_uoa:BuildRequires:     libaccounts-glib-devel >= 1.4}
+BuildRequires: libsecret-devel >= 0.5
+%{?with_uoa:BuildRequires:     libsignon-glib-devel >= 1.1}
 BuildRequires: libsoup-devel >= 2.42.0
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
 BuildRequires: libxml2-devel >= 2
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: rest-devel >= 0.7
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: tar >= 1:1.22
+BuildRequires: telepathy-glib-devel >= 0.20
+%{?with_uoa:BuildRequires:     telepathy-mission-control-devel >= 5.13.1}
+BuildRequires: udev-glib-devel
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 Requires:      %{name}-libs = %{version}-%{release}
 %if %{with kerberos5}
-BuildRequires: /usr/bin/krb5-config
 BuildRequires: gcr-devel >= 3
+BuildRequires: krb5-devel
 %endif
 Requires(post,postun): gtk-update-icon-cache
-Requires:      glib2 >= 1:2.36.0
-Requires:      gtk+3 >= 3.6.0
 Requires:      hicolor-icon-theme
-Requires:      libnotify >= 0.7
-Requires:      libsoup >= 2.42.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,6 +66,14 @@ sieciowych.
 Summary:       gnome-online-accounts libraries
 Summary(pl.UTF-8):     Biblioteki gnome-online-accounts
 Group:         Libraries
+Requires:      glib2 >= 1:2.36.0
+Requires:      gtk+3 >= 3.12.0
+Requires:      gtk-webkit3 >= 2.2.0
+%{?with_uoa:Requires:  libaccounts-glib >= 1.4}
+Requires:      libsecret >= 0.5
+%{?with_uoa:Requires:  libsignon-glib >= 1.1}
+Requires:      libsoup >= 2.42.0
+Requires:      telepathy-glib >= 0.20
 Conflicts:     gnome-online-accounts < 3.8.2-1.1
 
 %description libs
@@ -76,7 +88,7 @@ Summary(pl.UTF-8):    Pliki programistyczne bibliotek gnome-online-accounts
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      glib2-devel >= 1:2.36.0
-Requires:      gtk+3-devel >= 3.6.0
+Requires:      gtk+3-devel >= 3.12.0
 
 %description devel
 The gnome-online-accounts-devel package contains the header files for
@@ -100,6 +112,7 @@ Dokumentacja API GOA.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -107,13 +120,21 @@ Dokumentacja API GOA.
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd telepathy-account-widgets
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
 %configure \
        --disable-silent-rules \
        --disable-static \
+       %{!?with_uoa:--disable-ubuntu-online-accounts} \
        --enable-gtk-doc \
        %{?with_kerberos5:--enable-kerberos} \
        --with-html-dir=%{_gtkdocdir}
@@ -127,25 +148,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang gnome-online-accounts
+%find_lang gnome-online-accounts --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %update_icon_cache hicolor
 
 %postun
-/sbin/ldconfig
 %update_icon_cache hicolor
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %files -f gnome-online-accounts.lang
 %defattr(644,root,root,755)
-%doc NEWS
+%doc NEWS README
 %attr(755,root,root) %{_libexecdir}/goa-daemon
 %{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service
-%{_iconsdir}/hicolor/*/apps/goa-*.png
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/*/apps/*.svg
 %{_mandir}/man8/goa-daemon.8*
 %{_libdir}/girepository-1.0/Goa-1.0.typelib
 %{_datadir}/gnome-online-accounts
@@ -155,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgoa-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgoa-1.0.so.0
 %attr(755,root,root) %{_libdir}/libgoa-backend-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgoa-backend-1.0.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgoa-backend-1.0.so.1
 
 %files devel
 %defattr(644,root,root,755)