From 6fc29ca3e53ebb62e75b29773b6df6210b1cd290 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Nov 2020 12:30:28 -0600 Subject: [PATCH] fix build, add %%check --- signon-plugin-oauth2-cxxflags.patch | 14 +++++++++++++- signon-plugin-oauth2.spec | 10 ++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/signon-plugin-oauth2-cxxflags.patch b/signon-plugin-oauth2-cxxflags.patch index 42deded..d047055 100644 --- a/signon-plugin-oauth2-cxxflags.patch +++ b/signon-plugin-oauth2-cxxflags.patch @@ -7,7 +7,7 @@ diff -up signon-plugin-oauth2.git/common-project-config.pri.cxxflags signon-plug -QMAKE_CXXFLAGS += -fno-exceptions \ - -fno-rtti -+QMAKE_CXXFLAGS += -fno-exceptions ++#QMAKE_CXXFLAGS += -fno-exceptions \ +# -fno-rtti # we don't like warnings... -QMAKE_CXXFLAGS += -Werror @@ -15,3 +15,15 @@ diff -up signon-plugin-oauth2.git/common-project-config.pri.cxxflags signon-plug TOP_SRC_DIR = $$PWD +diff -up signon-plugin-oauth2.git/tests/tests.pro.cxxflags signon-plugin-oauth2.git/tests/tests.pro +--- signon-plugin-oauth2.git/tests/tests.pro.cxxflags 2015-04-17 01:59:01.000000000 -0500 ++++ signon-plugin-oauth2.git/tests/tests.pro 2020-11-08 12:25:41.647654996 -0600 +@@ -6,6 +6,8 @@ QT += core \ + testlib + QT -= gui + ++QMAKE_CXXFLAGS += -fno-rtti ++ + DEFINES -= SIGNON_TRACE + CONFIG += \ + link_pkgconfig diff --git a/signon-plugin-oauth2.spec b/signon-plugin-oauth2.spec index 54992fe..9ae85b5 100644 --- a/signon-plugin-oauth2.spec +++ b/signon-plugin-oauth2.spec @@ -45,7 +45,7 @@ export PATH=%{_qt5_bindir}:$PATH %install -%make_install +%make_install INSTALL_ROOT=%{buildroot} # Delete tests rm -fv %{buildroot}/%{_bindir}/signon-oauth2plugin-tests @@ -55,6 +55,11 @@ rm -rfv %{buildroot}/%{_datadir}/signon-oauth2plugin-tests rm -fv %{buildroot}/%{_bindir}/oauthclient rm -rvf %{buildroot}/%{_sysconfdir} + +%check +%make_build check + + %ldconfig_scriptlets %files @@ -67,8 +72,9 @@ rm -rvf %{buildroot}/%{_sysconfdir} %changelog * Sun Nov 08 2020 Rex Dieter - 0.22-14 -- patch out -Werror -fno-rtti (#1891251) +- patch out -Werror move -no-rtti for tests/ only (#1891251) - use %%autosetup, %%make_build, %%make_install +- add %check * Wed Jul 29 2020 Fedora Release Engineering - 0.22-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild