From 9387c747ab2350accbd54557859f2f6d5f272b4d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 21 Jul 2018 09:46:34 -0500 Subject: [PATCH] use %%make_build %%ldconfig --- qt.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/qt.spec b/qt.spec index 7351b7b..7b7135a 100644 --- a/qt.spec +++ b/qt.spec @@ -797,25 +797,23 @@ fi %if ! 0%{?inject_optflags} # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults) make clean -C qmake -make %{?_smp_mflags} -C qmake \ +%make_build -C qmake \ QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}" \ QMAKE_STRIP= %endif -make %{?_smp_mflags} +%make_build # TODO: consider patching tools/tools.pro to enable building this by default -%{?qvfb:make %{?_smp_mflags} -C tools/qvfb} +%{?qvfb:%make_build -C tools/qvfb} # recreate .qm files bin/lrelease translations/*.ts %install -rm -rf %{buildroot} - make install INSTALL_ROOT=%{buildroot} %if 0%{?qvfb} @@ -1063,7 +1061,7 @@ fi %endif %post -/sbin/ldconfig +%{?ldconfig} %if 0%{?qtchooser} %{_sbindir}/update-alternatives \ --install %{_sysconfdir}/xdg/qtchooser/4.conf \ @@ -1079,7 +1077,7 @@ fi %endif %postun -/sbin/ldconfig +%{?ldconfig} %if 0%{?qtchooser} if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives \ @@ -1407,6 +1405,7 @@ fi %changelog * Sat Jul 21 2018 Rex Dieter - 1:4.8.7-42 - drop BR: pkgconfig(NetworkManager) (#1606047) +- use %%make_build %%ldconfig * Sat Jul 14 2018 Fedora Release Engineering - 1:4.8.7-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild