- updated to 3.28.4

diff --git a/gnome-builder.spec b/gnome-builder.spec
index 9222ddfdb7c5952798192f821fe19c8087d1de3b..4e4d9111af10b96848d056e0a5398e6951f3cf2e 100644 (file)
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -1,19 +1,21 @@
 # TODO:
+# - deviced (BR: libdeviced-devel >= 3.27.4)
 # - fix warning: jedi not found, python auto-completion not possible.
 #
 # Conditional build:
-%bcond_with    sysprof         # sysprof system profiler plugin
-%bcond_with    vala_pack       # vala pack plugin
+%bcond_without sysprof         # sysprof system profiler plugin
+%bcond_without vala_pack       # vala pack plugin
+%bcond_without apidocs         # Sphinx based help + gtk-doc 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.28.0
-Release:       2
+Version:       3.28.4
+Release:       1
 License:       GPL v3+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-builder/3.28/%{name}-%{version}.tar.xz
-# Source0-md5: 5963331e96922e2caf6bf66b36ad4b10
+# Source0-md5: 55f62b415c8a8da23d38d5c6c08af57e
 # Should be safe to remove when we move to gcc 8
 Patch0:                unknown-gcc-option.patch
 URL:           https://wiki.gnome.org/Apps/Builder
@@ -21,23 +23,23 @@ BuildRequires:      appstream-glib-devel
 BuildRequires: clang-devel >= 3.5
 BuildRequires: desktop-file-utils
 BuildRequires: devhelp-devel >= 3.26.0
-BuildRequires: enchant-devel >= 1.6.0
+BuildRequires: enchant2-devel >= 2
 BuildRequires: flatpak-devel >= 0.8.0
 # -std=gnu11 for C
 BuildRequires: gcc >= 6:4.7
 BuildRequires: gettext-tools >= 0.19.8
 BuildRequires: gjs-devel >= 1.42.0
-BuildRequires: glib2-devel >= 1:2.50.0
+BuildRequires: glib2-devel >= 1:2.56.0
 BuildRequires: gobject-introspection-devel >= 1.48.0
 BuildRequires: gspell-devel >= 1.2.0
-BuildRequires: gtk+3-devel >= 3.22.1
-BuildRequires: gtk-doc >= 1.11
+BuildRequires: gtk+3-devel >= 3.22.26
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.11}
 BuildRequires: gtk-webkit4-devel >= 2.12.0
-BuildRequires: gtksourceview3-devel >= 3.22.0
+BuildRequires: gtksourceview3-devel >= 3.24.0
 BuildRequires: intltool >= 0.50.1
 BuildRequires: json-glib-devel >= 1.2.0
 BuildRequires: jsonrpc-glib-devel >= 3.28.0
-BuildRequires: libdazzle-devel
+BuildRequires: libdazzle-devel >= 3.28.0
 BuildRequires: libgit2-glib-devel >= 0.25.0
 BuildRequires: libpeas-devel >= 1.22.0
 BuildRequires: libsoup-devel >= 2.52.0
@@ -46,7 +48,7 @@ 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
+BuildRequires: meson >= 0.44.0
 BuildRequires: ninja
 BuildRequires: pango-devel >= 1:1.38.0
 BuildRequires: pcre-devel
@@ -54,33 +56,39 @@ BuildRequires:      pkgconfig >= 1:0.22
 BuildRequires: python3-devel >= 1:3.2.3
 BuildRequires: python3-pygobject3-devel >= 3.22.0
 BuildRequires: rpmbuild(macros) >= 1.522
+%{?with_apidocs:BuildRequires: sphinx-pdg-3}
 %{?with_sysprof:BuildRequires: sysprof-ui-devel >= 3.28.0}
 BuildRequires: tar >= 1:1.22
-BuildRequires: template-glib-devel
+BuildRequires: template-glib-devel >= 3.28.0
 BuildRequires: vala >= 2:0.30.0.55
-BuildRequires: vala-gtksourceview
-BuildRequires: vala-jsonrpc-glib
-BuildRequires: vala-libdazzle
-BuildRequires: vala-libgit2-glib >= 0.24.0
-BuildRequires: vala-template-glib
+BuildRequires: vala-gtksourceview >= 3.24.0
+BuildRequires: vala-libdazzle >= 3.28.0
+BuildRequires: vala-libgit2-glib >= 0.25.0
+BuildRequires: vala-template-glib >= 3.28.0
+%if %{with vala_pack}
+BuildRequires: vala-jsonrpc-glib >= 3.28.0
+BuildRequires: vala-vte >= 0.46
+%endif
 BuildRequires: vte-devel >= 0.46
 BuildRequires: xz
 BuildRequires: yelp-tools
-BuildConflicts:        gd-devel
-Requires(post,postun): glib2 >= 1:2.50.0
+Requires(post,postun): glib2 >= 1:2.56.0
 Requires(post,postun): gtk-update-icon-cache
 Requires:      ctags
 Requires:      devhelp-libs >= 3.26.0
-Requires:      enchant >= 1.6.0
-Requires:      flatpak-libs >= 0.6.9
+Requires:      enchant2 >= 2
+Requires:      flatpak-libs >= 0.8.0
 Requires:      gjs >= 1.42.0
-Requires:      glib2 >= 1:2.50.0
-Requires:      gtk+3 >= 3.22.1
+Requires:      glib2 >= 1:2.56.0
+Requires:      gspell >= 1.2.0
+Requires:      gtk+3 >= 3.22.26
 Requires:      gtk-webkit4 >= 2.12.0
-Requires:      gtksourceview3 >= 3.22.0
+Requires:      gtksourceview3 >= 3.24.0
 Requires:      hicolor-icon-theme
 Requires:      json-glib >= 1.2.0
-Requires:      libgit2-glib >= 0.24.0
+Requires:      jsonrpc-glib >= 3.28.0
+Requires:      libdazzle >= 3.28.0
+Requires:      libgit2-glib >= 0.25.0
 Requires:      libpeas >= 1.22.0
 Requires:      libsoup >= 2.52.0
 Requires:      libxml2 >= 1:2.9.0
@@ -88,6 +96,7 @@ 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.28.0}
+Requires:      template-glib >= 3.28.0
 Requires:      vte >= 0.46
 Suggests:      python3-lxml
 Obsoletes:     gnome-builder-apidocs
@@ -109,10 +118,15 @@ 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.50.0
-Requires:      gtk+3-devel >= 3.22.1
-Requires:      gtksourceview3-devel >= 3.22.0
+Requires:      glib2-devel >= 1:2.56.0
+Requires:      gtk+3-devel >= 3.22.26
+Requires:      gtksourceview3-devel >= 3.24.0
+Requires:      jsonrpc-glib-devel >= 3.28.0
+Requires:      libdazzle-devel >= 3.28.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
 
 %description devel
@@ -127,9 +141,9 @@ Summary(pl.UTF-8):  API języka Vala dla GNOME Buildera
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.30
-# included in vala (0.30)
-#Requires:     vala-gtksourceview >= 3.18.0
-Requires:      vala-libgit2-glib >= 0.23.4
+Requires:      vala-gtksourceview >= 3.24.0
+Requires:      vala-libdazzle >= 3.28.0
+Requires:      vala-template-glib >= 3.28.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -140,12 +154,42 @@ Vala API for GNOME Builder.
 %description -n vala-gnome-builder -l pl.UTF-8
 API języka Vala dla GNOME Buildera.
 
+%package doc
+Summary:       GNOME Builder documentation
+Summary(pl.UTF-8):     Dokumentacja do GNOME Buildera
+Group:         Documentation
+Requires:      %{name} = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
+
+%description doc
+GNOME Builder documentation.
+
+%description doc -l pl.UTF-8
+Dokumentacja do GNOME Buildera.
+
+%package apidocs
+Summary:       API documentation for GNOME Builder libraries
+Summary(pl.UTF-8):     Dokumentacja API bibliotek GNOME Buildera
+Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
+
+%description apidocs
+API documentation for GNOME Builder libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek GNOME Buildera.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %meson build \
+       %{?with_apidocs:-Dwith_docs=true} \
        -Dwith_sysprof=%{__true_false sysprof} \
        -Dwith_vala_pack=%{__true_false vala_pack}
 
@@ -156,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install -C build
 
+%if %{with apidocs}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gnome-builder/en/{.buildinfo,.doctrees,_sources}
+%endif
+
 %find_lang %{name} --with-gnome
 
 %clean
@@ -211,6 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-builder/plugins/jhbuild.plugin
 %{_libdir}/gnome-builder/plugins/jhbuild_plugin.py
 
+%{_libdir}/gnome-builder/plugins/make.plugin
 %{_libdir}/gnome-builder/plugins/make_plugin.gresource
 %{_libdir}/gnome-builder/plugins/make_plugin.py
 
@@ -218,41 +267,39 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-builder/plugins/meson_templates.gresource
 %{_libdir}/gnome-builder/plugins/meson_templates.py
 
+%{_libdir}/gnome-builder/plugins/mono.plugin
+%{_libdir}/gnome-builder/plugins/mono_plugin.py
+
 %{_libdir}/gnome-builder/plugins/npm.plugin
 %{_libdir}/gnome-builder/plugins/npm_plugin.py
 
+%{_libdir}/gnome-builder/plugins/phpize.plugin
+%{_libdir}/gnome-builder/plugins/phpize_plugin.py
+
 %{_libdir}/gnome-builder/plugins/python-gi-imports-completion.plugin
 %{_libdir}/gnome-builder/plugins/python_gi_imports_completion.py
 
 %{_libdir}/gnome-builder/plugins/rust-langserv.plugin
 %{_libdir}/gnome-builder/plugins/rust_langserv_plugin.py
 
+%{_libdir}/gnome-builder/plugins/rustup.plugin
 %{_libdir}/gnome-builder/plugins/rustup_plugin.gresource
 %{_libdir}/gnome-builder/plugins/rustup_plugin.py
 
 %if %{with sysprof}
-%{_libdir}/gnome-builder/plugins/sysprof.plugin
+# not installed since 3.28
+#%{_libdir}/gnome-builder/plugins/sysprof.plugin
 %endif
 
 %if %{with vala_pack}
+%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libvala-pack-plugin.so
 %{_libdir}/gnome-builder/plugins/vala-pack.plugin
 %endif
 
-%{_libdir}/gnome-builder/plugins/make.plugin
-
-%{_libdir}/gnome-builder/plugins/mono.plugin
-%{_libdir}/gnome-builder/plugins/mono_plugin.py
-
-%{_libdir}/gnome-builder/plugins/phpize.plugin
-%{_libdir}/gnome-builder/plugins/phpize_plugin.py
-
-%{_libdir}/gnome-builder/plugins/rustup.plugin
-
 %{_libdir}/gnome-builder/plugins/valgrind.plugin
 %{_libdir}/gnome-builder/plugins/valgrind_plugin.gresource
 %{_libdir}/gnome-builder/plugins/valgrind_plugin.py
 
-%{_datadir}/metainfo/org.gnome.Builder.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Builder.service
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.builder.build.gschema.xml
@@ -268,6 +315,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}/metainfo/org.gnome.Builder.appdata.xml
 %{_desktopdir}/org.gnome.Builder.desktop
 %{_iconsdir}/hicolor/*x*/apps/org.gnome.Builder*.png
 %{_iconsdir}/hicolor/*x*/actions/*.png
@@ -290,3 +338,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-builder/vapi/gstyle-private.vapi
 %{_datadir}/gnome-builder/vapi/libide-1.0.deps
 %{_datadir}/gnome-builder/vapi/libide-1.0.vapi
+
+%if %{with apidocs}
+%files doc
+%defattr(644,root,root,755)
+%dir %{_docdir}/gnome-builder
+%{_docdir}/gnome-builder/en
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libide
+%endif