From bc6015b0e8818de5ca3bd672579166cd7dee4a09 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 24 2018 16:07:49 +0000 Subject: use /usr/bin/make -O -j4 %ldconfig_scriptlets --- diff --git a/qtsingleapplication.spec b/qtsingleapplication.spec index 3a154d7..5c030b5 100644 --- a/qtsingleapplication.spec +++ b/qtsingleapplication.spec @@ -3,7 +3,7 @@ Summary: Qt library to start applications only once per user Name: qtsingleapplication Version: 2.6.1 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv3 or LGPLv2 with exceptions URL: http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html @@ -146,10 +146,12 @@ sed -i -r 's,.include,\0 \n\0,' src/qtlocalpeer.h # Does not use GNU configure ./configure -library %{qmake_qt4} -make %{?_smp_mflags} +%make_build + pushd qt5 %{qmake_qt5} .. -make %{?_smp_mflags} +%make_build +popd %install @@ -175,13 +177,7 @@ install -p -m644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_qt4_datadir}/mkspecs/featu install -p -m644 qt5/*.prf %{buildroot}%{_qt5_archdatadir}/mkspecs/features -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post -n qtsinglecoreapplication -p /sbin/ldconfig - -%postun -n qtsinglecoreapplication -p /sbin/ldconfig +%ldconfig_scriptlets %files %license licenses/* @@ -197,6 +193,8 @@ install -p -m644 qt5/*.prf %{buildroot}%{_qt5_archdatadir}/mkspecs/features %{_qt4_headerdir}/QtSolutions/%{name}.h %{_qt4_datadir}/mkspecs/features/qtsingleapplication.prf +%ldconfig_scriptlets -n qtsinglecoreapplication + %files -n qtsinglecoreapplication %license licenses/* # Caution! Unversioned .so file goes into -devel @@ -209,6 +207,8 @@ install -p -m644 qt5/*.prf %{buildroot}%{_qt5_archdatadir}/mkspecs/features %{_qt4_headerdir}/QtSolutions/qtsinglecoreapplication.h %{_qt4_datadir}/mkspecs/features/qtsinglecoreapplication.prf +%ldconfig_scriptlets qt5 + %files qt5 %license licenses/* %doc README.TXT @@ -223,6 +223,8 @@ install -p -m644 qt5/*.prf %{buildroot}%{_qt5_archdatadir}/mkspecs/features %{_qt5_headerdir}/QtSolutions/%{name}.h %{_qt5_archdatadir}/mkspecs/features/qtsingleapplication.prf +%ldconfig_scriptlets -n qtsinglecoreapplication-qt5 + %files -n qtsinglecoreapplication-qt5 %license licenses/* # Caution! Unversioned .so file goes into -devel @@ -237,6 +239,9 @@ install -p -m644 qt5/*.prf %{buildroot}%{_qt5_archdatadir}/mkspecs/features %changelog +* Tue Jul 24 2018 Rex Dieter - 2.6.1-34 +- use %make_build %%ldconfig_scriptlets + * Sat Jul 14 2018 Fedora Release Engineering - 2.6.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild