diff --git a/signon-plugin-oauth2-cxxflags.patch b/signon-plugin-oauth2-cxxflags.patch new file mode 100644 index 0000000..42deded --- /dev/null +++ b/signon-plugin-oauth2-cxxflags.patch @@ -0,0 +1,17 @@ +diff -up signon-plugin-oauth2.git/common-project-config.pri.cxxflags signon-plugin-oauth2.git/common-project-config.pri +--- signon-plugin-oauth2.git/common-project-config.pri.cxxflags 2015-04-17 01:59:01.000000000 -0500 ++++ signon-plugin-oauth2.git/common-project-config.pri 2020-11-08 11:49:40.752319952 -0600 +@@ -15,10 +15,10 @@ UI_DIR = ui + UI_HEADERS_DIR = ui/include + UI_SOURCES_DIR = ui/src + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions ++# -fno-rtti + # we don't like warnings... +-QMAKE_CXXFLAGS += -Werror ++#QMAKE_CXXFLAGS += -Werror + + TOP_SRC_DIR = $$PWD + diff --git a/signon-plugin-oauth2.spec b/signon-plugin-oauth2.spec index 2394092..195c304 100644 --- a/signon-plugin-oauth2.spec +++ b/signon-plugin-oauth2.spec @@ -1,8 +1,7 @@ -%global optflags %{optflags} -Wno-error=deprecated-declarations -Wno-error=unused-variable Name: signon-plugin-oauth2 -Version: 0.22 -Release: 13%{?dist} +Version: 0.24 +Release: 14%{?dist} Summary: OAuth2 plugin for the Accounts framework License: LGPLv2 @@ -10,6 +9,9 @@ URL: https://gitlab.com/accounts-sso/signon-plugin-oauth2 Source0: https://gitlab.com/accounts-sso/signon-plugin-oauth2/repository/archive.tar.gz?ref=VERSION_%{version}#/%{name}-%{version}.tar.gz +# drop -Werror -fno-rtti +Patch100: signon-plugin-oauth2-cxxflags.patch + BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtxmlpatterns-devel BuildRequires: signon-devel @@ -26,21 +28,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. + %prep -%setup -q -n %{name}.git +%autosetup -n %{name}.git -p1 + %build export PATH=%{_qt5_bindir}:$PATH -%{qmake_qt5} QMF_INSTALL_ROOT=%{_prefix} \ +%qmake_qt5\ + QMF_INSTALL_ROOT=%{_prefix} \ CONFIG+=release \ LIBDIR=%{?_libdir} \ signon-oauth2.pro -make %{?_smp_mflags} +%make_build %install -make install INSTALL_ROOT=%{buildroot} +%make_install # Delete tests rm -fv %{buildroot}/%{_bindir}/signon-oauth2plugin-tests @@ -61,6 +66,10 @@ rm -rvf %{buildroot}/%{_sysconfdir} %changelog +* Sun Nov 08 2020 Rex Dieter - 0.22-14 +- patch out -Werror -fno-rtti (#1891251) +- use %%autosetup, %%make_build, %%make_install + * Wed Jul 29 2020 Fedora Release Engineering - 0.22-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild