X-Git-Url: https://git.pld-linux.org/?p=packages%2Fgnome-online-accounts.git;a=blobdiff_plain;f=gnome-online-accounts.spec;h=2bdacc80791c37c6a26fbc1c42af2f3f88cce12d;hp=b70dbe98877154eeed386d445fc449cd63ff0950;hb=HEAD;hpb=2bf19eb7ff1c669ddede580b3eaba2bc20769fdf

diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec
index b70dbe9..b364c98 100644
--- a/gnome-online-accounts.spec
+++ b/gnome-online-accounts.spec
@@ -1,42 +1,42 @@
 #
 # Conditional build:
+%bcond_with	fedora		# Kerberos 5 with Fedora realm
 %bcond_with	kerberos5	# Kerberos 5 support [TODO: heimdal support; needs MIT currently]
-%bcond_with	webkitinspector	# WebKitInspector for the embedded web view
 
 Summary:	Provide online accounts information
 Summary(pl.UTF-8):	Dostarczanie informacji o kontach w serwisach sieciowych
 Name:		gnome-online-accounts
-Version:	3.38.0
+Version:	3.50.1
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-online-accounts/3.38/%{name}-%{version}.tar.xz
-# Source0-md5:	fa62ae47bfe3b78a72db5d414b8de4d8
+Source0:	https://download.gnome.org/sources/gnome-online-accounts/3.50/%{name}-%{version}.tar.xz
+# Source0-md5:	f28ddf850689a9f3f646e3ae0dbb8b03
+Patch0:		no-gnome-post-install.patch
 URL:		https://wiki.gnome.org/Projects/GnomeOnlineAccounts
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	dbus-glib-devel
+BuildRequires:	dbus-devel
 BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.52.0
+BuildRequires:	glib2-devel >= 1:2.67.4
 BuildRequires:	gobject-introspection-devel >= 0.6.2
-BuildRequires:	gtk+3-devel >= 3.20.0
+BuildRequires:	gtk4-devel >= 4.10
 BuildRequires:	gtk-doc >= 1.3
-BuildRequires:	gtk-webkit4-devel >= 2.26.0
 BuildRequires:	json-glib-devel
+BuildRequires:	libadwaita-devel >= 1.4
 BuildRequires:	libsecret-devel >= 0.5
-BuildRequires:	libsoup-devel >= 2.42.0
-BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libsoup3-devel >= 3.0
 BuildRequires:	libxml2-devel >= 2
 BuildRequires:	libxslt-progs
+BuildRequires:	meson >= 0.57.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig >= 1:0.16
-BuildRequires:	rest-devel >= 0.7
+BuildRequires:	rest1-devel >= 0.9.0
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	udev-glib-devel
-BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	vala
 BuildRequires:	xz
-%if %{with kerberos5}
-BuildRequires:	gcr-devel >= 3
+%if %{with fedora} || %{with kerberos5}
+BuildRequires:	gcr4-devel >= 4.1.0
 BuildRequires:	krb5-devel
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
@@ -57,11 +57,11 @@ sieciowych.
 Summary:	gnome-online-accounts libraries
 Summary(pl.UTF-8):	Biblioteki gnome-online-accounts
 Group:		Libraries
-Requires:	glib2 >= 1:2.52.0
-Requires:	gtk+3 >= 3.20.0
-Requires:	gtk-webkit4 >= 2.26.0
+Requires:	glib2 >= 1:2.67.4
+Requires:	gtk4 >= 4.10
+Requires:	libadwaita >= 1.4
 Requires:	libsecret >= 0.5
-Requires:	libsoup >= 2.42.0
+Requires:	libsoup3 >= 3.0
 Conflicts:	gnome-online-accounts < 3.8.2-1.1
 
 %description libs
@@ -75,8 +75,9 @@ Summary:	Development files for gnome-online-accounts libraries
 Summary(pl.UTF-8):	Pliki programistyczne bibliotek gnome-online-accounts
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.52.0
-Requires:	gtk+3-devel >= 3.20.0
+Requires:	glib2-devel >= 1:2.67.4
+Requires:	gtk4-devel >= 4.10
+Requires:	libadwaita-devel >= 1.4
 
 %description devel
 The gnome-online-accounts-devel package contains the header files for
@@ -115,35 +116,24 @@ API języka Vala do bibliotek gnome-online-accounts.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-# "fedora" is krb5+gcr
-%configure \
-	--disable-silent-rules \
-	--disable-static \
-	--enable-documentation \
-	%{!?with_kerberos:--disable-fedora} \
-	--enable-gtk-doc \
-	%{?with_webkitinspector:--enable-inspector} \
-	%{__enable_disable kerberos5 kerberos} \
-	--enable-lastfm \
-	--enable-media-server \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	%{?with_fedora:-Dfedora=true} \
+	-Dgtk_doc=true \
+	%{!?with_kerberos:-Dkerberos=false} \
+	-Dman=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/goa-1.0/web-extensions/lib*.la
+# not supported by glibc (as of 2.37)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
 
 %find_lang gnome-online-accounts --all-name
 
@@ -161,13 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f gnome-online-accounts.lang
 %defattr(644,root,root,755)
-%doc NEWS README
+%doc NEWS README.md
 %attr(755,root,root) %{_libexecdir}/goa-daemon
+%attr(755,root,root) %{_libexecdir}/goa-oauth2-handler
+%if %{with fedora} || %{with kerberos5}
+%attr(755,root,root) %{_libexecdir}/goa-identity-service
+%endif
 %dir %{_libdir}/goa-1.0
-%dir %{_libdir}/goa-1.0/web-extensions
-%attr(755,root,root) %{_libdir}/goa-1.0/web-extensions/libgoawebextension.so
 %{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service
 %{_datadir}/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml
+%{_desktopdir}/org.gnome.OnlineAccounts.OAuth2.desktop
 %{_iconsdir}/hicolor/scalable/apps/goa-account*.svg
 %{_iconsdir}/hicolor/symbolic/apps/goa-account*-symbolic.svg
 %{_mandir}/man8/goa-daemon.8*
@@ -177,7 +170,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.1
+%attr(755,root,root) %ghost %{_libdir}/libgoa-backend-1.0.so.2
 %{_libdir}/girepository-1.0/Goa-1.0.typelib
 
 %files devel