From bc8f4ec7a6b17a6ce67690db92dd33ca3bbbc1159ddacd6bbe48c2193c821208 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 12 Mar 2020 19:38:37 +0000 Subject: [PATCH] Accepting request 784381 from home:vladisav:branches:devel:tools - Since cppcheck version 1.89 CFGDIR is replaced by FILESDIR and cfg files are no longer kept in FILESDIR but in subfolder FILESDIR/cfg. OBS-URL: https://build.opensuse.org/request/show/784381 OBS-URL: https://build.opensuse.org/package/show/devel:tools/cppcheck?expand=0&rev=68 --- cppcheck.changes | 6 ++++++ cppcheck.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cppcheck.changes b/cppcheck.changes index 414dcff..381ac37 100644 --- a/cppcheck.changes +++ b/cppcheck.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 12 12:54:24 UTC 2020 - Vladislav Savic + +- Since cppcheck version 1.89 CFGDIR is replaced by FILESDIR and + cfg files are no longer kept in FILESDIR but in subfolder FILESDIR/cfg. + ------------------------------------------------------------------- Wed Mar 4 12:17:56 UTC 2020 - Martin Pluskal diff --git a/cppcheck.spec b/cppcheck.spec index e618271..9b3184b 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -74,7 +74,8 @@ doesn't see. %build %cmake \ - -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags} -UCFGDIR -DCFGDIR=\\\"%{_datadir}/%{name}\\\"" \ + -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags}" \ + -DFILESDIR="%{_datadir}/%{name}" \ -DBUILD_GUI=ON \ -DBUILD_TESTS=ON \ -DHAVE_RULES=yes @@ -101,8 +102,8 @@ install -Dpm 0755 build/bin/cppcheck-gui \ %{buildroot}%{_bindir}/cppcheck-gui install -Dpm 0644 cppcheck.1 \ %{buildroot}%{_mandir}/man1/cppcheck.1 -install -d %{buildroot}%{_datadir}/%{name} -install -pm 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} +install -d %{buildroot}%{_datadir}/%{name}/cfg +install -pm 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name}/cfg %files %doc AUTHORS