X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gnome-builder.spec;h=bb8ab4f6edf7238516a84394d680a73f8b4f071d;hb=cdf7b471d27a91c72cf5f678be6210602da9af2e;hp=c3f308860e844fe074a1136adb69fafe39abf325;hpb=807399d6323e59ade8d9a8b12a6f8127d3fb5410;p=packages%2Fgnome-builder.git

diff --git a/gnome-builder.spec b/gnome-builder.spec
index c3f3088..bb8ab4f 100644
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -1,43 +1,42 @@
 # TODO:
 # - deviced plugin (BR: libdeviced-devel >= 3.27.4)
-# - fix warning: jedi not found, python auto-completion not possible.
 #
 # Conditional build:
 %bcond_without	sysprof		# sysprof system profiler plugin
-%bcond_without	vala_pack	# vala pack plugin
-%bcond_without	apidocs		# Sphinx based help + gtk-doc API documentation
+%bcond_without	apidocs		# Sphinx based help + gi-docgen API documentation
 #
 Summary:	IDE for writing GNOME-based software
 Summary(pl.UTF-8):	IDE do tworzenia oprogramowania opartego na GNOME
 Name:		gnome-builder
-Version:	3.36.0
-Release:	2
+Version:	41.2
+Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-builder/3.36/%{name}-%{version}.tar.xz
-# Source0-md5:	3e36a5cd40e58231bbbb47c01cb5d888
+Source0:	https://download.gnome.org/sources/gnome-builder/41/%{name}-%{version}.tar.xz
+# Source0-md5:	977f29be13a1c291163c1cc0eef7ffdb
 URL:		https://wiki.gnome.org/Apps/Builder
 BuildRequires:	appstream-glib
 BuildRequires:	clang-devel >= 3.5
+BuildRequires:	cmark-devel >= 0.29.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	devhelp-devel >= 3.26.0
 BuildRequires:	enchant2-devel >= 2
-BuildRequires:	flatpak-devel >= 0.8.0
+BuildRequires:	flatpak-devel >= 1.10.2
 # -std=gnu11 for C
 BuildRequires:	gcc >= 6:4.7
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	gjs-devel >= 1.42.0
 BuildRequires:	glade-devel >= 3.22.0
-BuildRequires:	glib2-devel >= 1:2.61.2
+BuildRequires:	glib2-devel >= 1:2.69.1
 BuildRequires:	gobject-introspection-devel >= 1.48.0
 BuildRequires:	gspell-devel >= 1.2.0
-BuildRequires:	gtk+3-devel >= 3.22.26
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.11}
-BuildRequires:	gtk-webkit4-devel >= 2.22
+BuildRequires:	gtk+3-devel >= 3.24
+%{?with_apidocs:BuildRequires:	gi-docgen}
+BuildRequires:	gtk-webkit4-devel >= 2.26
 BuildRequires:	gtksourceview4-devel >= 4.0.0
 BuildRequires:	json-glib-devel >= 1.2.0
 BuildRequires:	jsonrpc-glib-devel >= 3.30.0
-BuildRequires:	libdazzle-devel >= 3.34.0
+BuildRequires:	libdazzle-devel >= 3.37.0
 BuildRequires:	libgit2-glib-devel >= 0.25.0
 BuildRequires:	libpeas-devel >= 1.22.0
 BuildRequires:	libportal-devel >= 0.3
@@ -47,45 +46,48 @@ BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.9.0
 BuildRequires:	llvm-devel >= 3.5
-BuildRequires:	meson >= 0.51.2
+BuildRequires:	meson >= 0.54.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	ostree-devel
 BuildRequires:	pango-devel >= 1:1.38.0
-BuildRequires:	pcre-devel
+BuildRequires:	pcre2-common-devel
 BuildRequires:	pkgconfig >= 1:0.22
 BuildRequires:	python3-devel >= 1:3.2.3
 BuildRequires:	python3-pygobject3-devel >= 3.22.0
-BuildRequires:	rpmbuild(macros) >= 1.736
+%{?with_apidocs:BuildRequires:	python3-sphinx_rtd_theme}
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
 %{?with_apidocs:BuildRequires:	sphinx-pdg-3}
-%{?with_sysprof:BuildRequires:	sysprof-ui-devel >= 3.33.4}
+%{?with_sysprof:BuildRequires:	sysprof-ui-devel >= 3.37.1}
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	template-glib-devel >= 3.28.0
 BuildRequires:	vala >= 2:0.30.0.55
 BuildRequires:	vala-gtksourceview4 >= 4.0.0
-BuildRequires:	vala-libdazzle >= 3.34.0
+BuildRequires:	vala-libdazzle >= 3.37.0
 BuildRequires:	vala-libgit2-glib >= 0.25.0
 BuildRequires:	vala-template-glib >= 3.28.0
 BuildRequires:	vala-vte >= 0.46
 BuildRequires:	vte-devel >= 0.46
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.61.2
+Requires(post,postun):	glib2 >= 1:2.69.1
 Requires(post,postun):	gtk-update-icon-cache
+Requires:	cmark-lib >= 0.29.0
 Requires:	ctags
 Requires:	devhelp-libs >= 3.26.0
 Requires:	enchant2 >= 2
-Requires:	flatpak-libs >= 0.8.0
+Requires:	flatpak-libs >= 1.10.2
 Requires:	gjs >= 1.42.0
 Requires:	glade-libs >= 3.22.0
-Requires:	glib2 >= 1:2.61.2
+Requires:	glib2 >= 1:2.69.1
 Requires:	gspell >= 1.2.0
-Requires:	gtk+3 >= 3.22.26
-Requires:	gtk-webkit4 >= 2.22
+Requires:	gtk+3 >= 3.24
+Requires:	gtk-webkit4 >= 2.26
 Requires:	gtksourceview4 >= 4.0.0
 Requires:	hicolor-icon-theme
 Requires:	json-glib >= 1.2.0
 Requires:	jsonrpc-glib >= 3.30.0
-Requires:	libdazzle >= 3.34.0
+Requires:	libdazzle >= 3.37.0
 Requires:	libgit2-glib >= 0.25.0
 Requires:	libpeas >= 1.22.0
 Requires:	libportal >= 0.3
@@ -94,15 +96,16 @@ Requires:	libxml2 >= 1:2.9.0
 Requires:	pango >= 1:1.38.0
 Requires:	python3-modules >= 1:3.2.3
 Requires:	python3-pygobject3 >= 3.22.0
-%{?with_sysprof:Requires:	sysprof-ui-libs >= 3.33.4}
+%{?with_sysprof:Requires:	sysprof-ui-libs >= 3.37.1}
 Requires:	template-glib >= 3.28.0
 Requires:	vte >= 0.46
-#Suggests:	python3-jedi
+Suggests:	python3-jedi
 Suggests:	python3-lxml
-Obsoletes:	gnome-builder-mm
+Obsoletes:	gnome-builder-mm < 3.24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		apiver	3.36
+%define		abiver	41.0
+%define		apiver	41
 
 %description
 Builder attempts to be an IDE for writing software for GNOME. It does
@@ -119,16 +122,16 @@ Summary:	Development files for GNOME Builder
 Summary(pl.UTF-8):	Pliki programistyczne GNOME Buildera
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.61.2
-Requires:	gtk+3-devel >= 3.22.26
+Requires:	glib2-devel >= 1:2.69.1
+Requires:	gtk+3-devel >= 3.24
 Requires:	gtksourceview4-devel >= 4.0.0
 Requires:	jsonrpc-glib-devel >= 3.30.0
-Requires:	libdazzle-devel >= 3.34.0
+Requires:	libdazzle-devel >= 3.37.0
 Requires:	libpeas-devel >= 1.22.0
 Requires:	pango-devel >= 1:1.38.0
 Requires:	template-glib-devel >= 3.28.0
 Requires:	vte-devel >= 0.46
-Obsoletes:	gnome-builder-mm-devel
+Obsoletes:	gnome-builder-mm-devel < 3.24
 Obsoletes:	vala-gnome-builder < 3.36
 
 %description devel
@@ -142,9 +145,7 @@ Summary:	GNOME Builder documentation
 Summary(pl.UTF-8):	Dokumentacja do GNOME Buildera
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
-%endif
 
 %description doc
 GNOME Builder documentation.
@@ -156,9 +157,7 @@ Dokumentacja do GNOME Buildera.
 Summary:	API documentation for GNOME Builder libraries
 Summary(pl.UTF-8):	Dokumentacja API bibliotek GNOME Buildera
 Group:		Documentation
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 API documentation for GNOME Builder libraries.
@@ -180,9 +179,9 @@ grep -rl /usr/bin/env src/plugins src/libide | xargs sed -i -e '1{
 	-Ddocs=true \
 	-Dhelp=true \
 %endif
+	-Dplugin_rls=true \
 	-Dplugin_sysprof=%{__true_false sysprof} \
-	-Dplugin_vagrant=true \
-	-Dplugin_vala=%{__true_false vala_pack}
+	-Dplugin_vagrant=true
 # -Dplugin_deviced=true
 
 %meson_build -C build
@@ -193,7 +192,11 @@ rm -rf $RPM_BUILD_ROOT
 %meson_install -C build
 
 %if %{with apidocs}
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gnome-builder/en/{.buildinfo,.doctrees,_sources}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gnome-builder/en/{.buildinfo,_sources,objects.inv}
+
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/libide $RPM_BUILD_ROOT%{_gtkdocdir}
 %endif
 
 %find_lang %{name} --with-gnome
@@ -215,9 +218,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-builder
 %dir %{_libdir}/gnome-builder
 %dir %{_libdir}/gnome-builder/girepository-1.0
-%{_libdir}/gnome-builder/girepository-1.0/Ide-%{apiver}.typelib
+%{_libdir}/gnome-builder/girepository-1.0/Ide-%{abiver}.typelib
 %dir %{_libdir}/gnome-builder/plugins
 %attr(755,root,root) %{_libexecdir}/gnome-builder-clang
+%attr(755,root,root) %{_libexecdir}/gnome-builder-flatpak
 %attr(755,root,root) %{_libexecdir}/gnome-builder-git
 %dir %{_datadir}/gnome-builder
 %{_datadir}/gnome-builder/fonts
@@ -250,8 +254,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-builder/plugins/html-preview.plugin
 %{_libdir}/gnome-builder/plugins/html_preview.py
 
-%{_libdir}/gnome-builder/plugins/jedi.plugin
-%{_libdir}/gnome-builder/plugins/jedi_plugin.py
+%{_libdir}/gnome-builder/plugins/jedi-language-server.plugin
+%{_libdir}/gnome-builder/plugins/jedi_language_server_plugin.py
 
 %{_libdir}/gnome-builder/plugins/jhbuild.plugin
 %{_libdir}/gnome-builder/plugins/jhbuild_plugin.py
@@ -276,10 +280,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-builder/plugins/python-gi-imports-completion.plugin
 %{_libdir}/gnome-builder/plugins/python_gi_imports_completion.py
 
-%{_libdir}/gnome-builder/plugins/rustup.plugin
-%{_libdir}/gnome-builder/plugins/rustup_plugin.gresource
-%{_libdir}/gnome-builder/plugins/rustup_plugin.py
-
 %{_libdir}/gnome-builder/plugins/gradle.plugin
 %{_libdir}/gnome-builder/plugins/gradle_plugin.py
 
@@ -301,10 +301,11 @@ rm -rf $RPM_BUILD_ROOT
 #%{_libdir}/gnome-builder/plugins/sysprof.plugin
 %endif
 
-%if %{with vala_pack}
 %{_libdir}/gnome-builder/plugins/vala-pack.plugin
 %{_libdir}/gnome-builder/plugins/vala_pack_plugin.py
-%endif
+
+%{_libdir}/gnome-builder/plugins/vala_langserv.plugin
+%{_libdir}/gnome-builder/plugins/vala_langserv.py
 
 %{_libdir}/gnome-builder/plugins/valgrind.plugin
 %{_libdir}/gnome-builder/plugins/valgrind_plugin.gresource
@@ -323,10 +324,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.plugins.color_picker_plugin.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.project.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.project-tree.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.builder.rust-analyzer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.terminal.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.workbench.gschema.xml
-%{_datadir}/gtksourceview-3.0/styles/builder*.xml
-%{_datadir}/gtksourceview-4/styles/builder*.xml
+%{_datadir}/gtksourceview-4/styles/Adwaita*.style-scheme.xml
+%{_datadir}/gtksourceview-4/styles/builder*.style-scheme.xml
 %{_datadir}/metainfo/org.gnome.Builder.appdata.xml
 %{_desktopdir}/org.gnome.Builder.desktop
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.Builder-symbolic.svg
@@ -338,9 +340,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-builder
 %{_includedir}/gnome-builder-%{apiver}
 %dir %{_datadir}/gnome-builder/gir-1.0
-%{_datadir}/gnome-builder/gir-1.0/Ide-%{apiver}.gir
+%{_datadir}/gnome-builder/gir-1.0/Ide-%{abiver}.gir
 %dir %{_libdir}/gnome-builder/pkgconfig
-%{_libdir}/gnome-builder/pkgconfig/gnome-builder-%{apiver}.pc
+%{_libdir}/gnome-builder/pkgconfig/gnome-builder-%{version}.pc
 
 %if %{with apidocs}
 %files doc