Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2019-12-18 14:44:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk3" Wed Dec 18 14:44:19 2019 rev:153 rq:756771 version:3.24.13+0 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2019-12-11 12:05:17.180736285 +0100 +++ /work/SRC/openSUSE:Factory/.gtk3.new.4691/gtk3.changes 2019-12-18 14:48:08.697933858 +0100 @@ -1,0 +2,6 @@ +Wed Dec 11 20:03:40 UTC 2019 - Stefan Brüns <[email protected]> + +- Split API doc generation from main package using _multibuild, + libgtk3 itself only takes a fraction of the time to build. + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.9tf5hN/_old 2019-12-18 14:48:11.801935277 +0100 +++ /var/tmp/diff_new_pack.9tf5hN/_new 2019-12-18 14:48:11.801935277 +0100 @@ -17,11 +17,24 @@ # +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "" +%global pname gtk3 +%bcond_with doc +%endif + +%if "%{flavor}" == "doc" +%global pname gtk3-doc +%bcond_without doc +%endif + # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 3.0.0 %define _name gtk %bcond_without broadway -Name: gtk3 +%bcond_with doc +Name: %{pname} Version: 3.24.13+0 Release: 0 Summary: The GTK+ toolkit library (version 3) @@ -42,7 +55,10 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gettext-tools-mini >= 0.19.7 +# Autotools requires gtk-doc even with --disable-gtk-doc, try again with meson +%if %{with doc} || 1 BuildRequires: gtk-doc +%endif BuildRequires: hicolor-icon-theme # libtool is needed since we are using a git checkout BuildRequires: libtool @@ -353,6 +369,17 @@ %lang_package +%package -n gtk3-devel-doc +Summary: API documentation for the GTK+ toolkit library v3 +Group: Documentation/HTML + +%description -n gtk3-devel-doc +GTK+ is a multi-platform toolkit for creating graphical user interfaces. +Offering a complete set of widgets, GTK+ is suitable for projects +ranging from small one-off projects to complete application suites. + +This package contains the API documentation for GTK+ 3.x. + %prep %setup -q -n %{_name}-%{version} translation-update-upstream @@ -375,7 +402,8 @@ NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ - --enable-gtk-doc \ + %{?with_doc: \ + --enable-gtk-doc} \ --enable-man \ --enable-x11-backend \ --enable-introspection \ @@ -385,9 +413,18 @@ --enable-explicit-deps=yes \ --enable-colord \ %{nil} + +%if "%{flavor}" == "" make %{?_smp_mflags} V=1 +%else +make %{?_smp_mflags} V=1 -C gdk +make %{?_smp_mflags} V=1 -C gtk +make %{?_smp_mflags} V=1 -C tests +make %{?_smp_mflags} V=1 -C docs +%endif %install +%if "%{flavor}" == "" %make_install find %{buildroot} -type f -name "*.la" -delete -print # Do not install the exampleapp glib schema, as the app itself is noinst @@ -415,6 +452,12 @@ # Install rpm macros mkdir -p %{buildroot}%{_rpmmacrodir} cp %{SOURCE3} %{buildroot}%{_rpmmacrodir} + +%else +%make_install -C docs +rm -Rf %{buildroot}%{_mandir}/man1/ +%endif + %fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_libdir} @@ -545,6 +588,7 @@ update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 fi +%if "%{flavor}" == "" %files -n libgtk-3-0 %license COPYING %if "%{_lib}" == "lib64" @@ -644,10 +688,6 @@ %config(noreplace) %{_sysconfdir}/gtk-3.0/settings.ini %files devel -%doc HACKING README.commits -%doc %{_datadir}/gtk-doc/html/gail-libgail-util3/ -%doc %{_datadir}/gtk-doc/html/gdk3/ -%doc %{_datadir}/gtk-doc/html/gtk3/ %{_bindir}/gtk3-demo %{_bindir}/gtk3-demo-application %{_bindir}/gtk3-widget-factory @@ -690,5 +730,14 @@ %{_datadir}/gettext/its/gtkbuilder.loc %files lang -f gtk30.lang -f gtk30-properties.lang +%endif + +%if %{with doc} +%files -n gtk3-devel-doc +%doc HACKING README.commits +%doc %{_datadir}/gtk-doc/html/gail-libgail-util3/ +%doc %{_datadir}/gtk-doc/html/gdk3/ +%doc %{_datadir}/gtk-doc/html/gtk3/ +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>doc</package> </multibuild>
