Hello community, here is the log from the commit of package NetworkManager-applet for openSUSE:Factory checked in at 2018-01-01 22:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager-applet (Old) and /work/SRC/openSUSE:Factory/.NetworkManager-applet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager-applet" Mon Jan 1 22:08:33 2018 rev:12 rq:560180 version:1.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager-applet/NetworkManager-applet.changes 2017-12-21 11:26:20.656324012 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager-applet.new/NetworkManager-applet.changes 2018-01-01 22:08:43.546937037 +0100 @@ -1,0 +2,10 @@ +Wed Dec 27 15:59:35 UTC 2017 - dimstar@opensuse.org + +- Allow for easy switch between meson and autoconf, using + bcond_with (default to autoconf for now): Switch back to autoconf + build system: meson is not ready and breaks nm-connection-editor + (incompletely linked resources, boo#1072789). + + In case of autoconf, add libtool BuildRequires, call autoreconf + and use configure/make/mak_install. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-applet.spec ++++++ --- /var/tmp/diff_new_pack.6x4eTr/_old 2018-01-01 22:08:45.274360324 +0100 +++ /var/tmp/diff_new_pack.6x4eTr/_new 2018-01-01 22:08:45.286356319 +0100 @@ -22,6 +22,8 @@ %bcond_with appindicator %endif +%bcond_with meson + %define with_cacert_patch 0 %define sover 0 %define _name network-manager-applet @@ -43,7 +45,11 @@ Patch3: 0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch BuildRequires: gtk-doc BuildRequires: intltool +%if %{with meson} BuildRequires: meson +%else +BuildRequires: libtool +%endif BuildRequires: pkgconfig # Needed by Patch0. BuildRequires: polkit-devel @@ -181,15 +187,28 @@ %patch3 -p1 %build +%if %{with meson} %meson \ %if %{with appindicator} -Denable-appindicator=true \ %endif -Denable-selinux=false %meson_build +%else +autoreconf -fiv +%configure \ + --disable-static \ + --without-selinux +%make_build +%endif %install +%if %{with meson} %meson_install +%else +%make_install +find %{buildroot} -type f -name '*.la' -delete -print +%endif %suse_update_desktop_file -r nm-connection-editor GTK GNOME System X-SuSE-ServiceConfiguration %find_lang nm-applet %{?no_lang_C}