From 5e143cf72d5f236fb8e0635dc7e5806e498592faab76356f995a9b7edea091a3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 27 Dec 2018 08:40:19 +0000 Subject: [PATCH 1/2] Accepting request 661440 from home:mathletic:branches:devel:tools - Use Python 3 instad of Python 2 - Switch to CMake as the used build system, otherwise Python 3 could not be detected by plain make OBS-URL: https://build.opensuse.org/request/show/661440 OBS-URL: https://build.opensuse.org/package/show/devel:tools/cppcheck?expand=0&rev=57 --- cppcheck.changes | 7 +++++++ cppcheck.spec | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/cppcheck.changes b/cppcheck.changes index fe42a2b..317413b 100644 --- a/cppcheck.changes +++ b/cppcheck.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 20 13:40:09 UTC 2018 - Christoph G + +- Use Python 3 instad of Python 2 +- Switch to CMake as the used build system, otherwise Python 3 + could not be detected by plain make + ------------------------------------------------------------------- Wed Dec 19 21:31:18 UTC 2018 - Christoph G diff --git a/cppcheck.spec b/cppcheck.spec index 7761a2c..834256f 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -24,14 +24,14 @@ License: GPL-3.0-or-later Group: Development/Languages/C and C++ URL: http://cppcheck.sourceforge.net/ Source: https://downloads.sourceforge.net/cppcheck/cppcheck-%{version}.tar.bz2 +BuildRequires: cmake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: pcre-devel -BuildRequires: python +BuildRequires: python3 BuildRequires: xsltproc -Requires: python -Requires: python-Pygments -Requires: python-xml +Requires: python3 +Requires: python3-Pygments %description This program tries to detect bugs that your C/C++ compiler don't see. Cppcheck @@ -62,6 +62,8 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: libqt5-linguist-devel + Requires: cppcheck %description gui @@ -73,31 +75,29 @@ doesn't see. %setup -q %build -make %{?_smp_mflags} \ - CXXFLAGS="-DNDEBUG %{optflags}" \ - SRCDIR=build \ - CFGDIR=%{_datadir}/%{name} \ - HAVE_RULES=yes +%define __builddir build + +%cmake \ + -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags}" \ + -DBUILD_GUI=ON \ + -DBUILD_TESTS=ON \ + -DHAVE_RULES=yes -pushd gui -%qmake5 \ - QMAKE_CXXFLAGS="-DNDEBUG %{optflags}" \ - HAVE_RULES=yes %make_jobs -popd +# does not work with CMake, directly call provided Makefile from source directory +cd .. make man \ DB2MAN=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl +cd build %check -make %{?_smp_mflags} test \ - CXXFLAGS="-DNDEBUG %{optflags}" \ - HAVE_RULES=yes +%make_jobs check %install -install -m 0755 -D cppcheck %{buildroot}%{_bindir}/cppcheck +install -m 0755 -D build/bin/cppcheck %{buildroot}%{_bindir}/cppcheck install -m 0755 -D htmlreport/cppcheck-htmlreport %{buildroot}%{_bindir}/cppcheck-htmlreport -install -m 0755 -D gui/cppcheck-gui %{buildroot}%{_bindir}/cppcheck-gui +install -m 0755 -D build/bin/cppcheck-gui %{buildroot}%{_bindir}/cppcheck-gui install -m 0644 -D cppcheck.1 %{buildroot}%{_mandir}/man1/cppcheck.1 install -d %{buildroot}%{_datadir}/%{name} install -m 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} From c4a11996effbdbe2c52230f30d50017270b87402d849660c66f87cd7b35a69f1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 27 Dec 2018 10:04:40 +0000 Subject: [PATCH 2/2] - Small packaging enhancements OBS-URL: https://build.opensuse.org/package/show/devel:tools/cppcheck?expand=0&rev=58 --- cppcheck.changes | 5 +++++ cppcheck.spec | 52 +++++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/cppcheck.changes b/cppcheck.changes index 317413b..584d49e 100644 --- a/cppcheck.changes +++ b/cppcheck.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 27 10:03:28 UTC 2018 - Martin Pluskal + +- Small packaging enhancements + ------------------------------------------------------------------- Thu Dec 20 13:40:09 UTC 2018 - Christoph G diff --git a/cppcheck.spec b/cppcheck.spec index 834256f..b023b98 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,10 +27,15 @@ Source: https://downloads.sourceforge.net/cppcheck/cppcheck-%{version}.t BuildRequires: cmake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ -BuildRequires: pcre-devel -BuildRequires: python3 +BuildRequires: libqt5-linguist-devel +BuildRequires: pkgconfig +BuildRequires: python3-base BuildRequires: xsltproc -Requires: python3 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(libpcre) Requires: python3-Pygments %description @@ -57,13 +62,6 @@ errors: %package gui Summary: A tool for static C/C++ code analysis Group: Development/Languages/C and C++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: libqt5-linguist-devel - Requires: cppcheck %description gui @@ -75,32 +73,36 @@ doesn't see. %setup -q %build -%define __builddir build - %cmake \ - -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags}" \ - -DBUILD_GUI=ON \ - -DBUILD_TESTS=ON \ - -DHAVE_RULES=yes - + -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags}" \ + -DBUILD_GUI=ON \ + -DBUILD_TESTS=ON \ + -DHAVE_RULES=yes %make_jobs # does not work with CMake, directly call provided Makefile from source directory cd .. make man \ DB2MAN=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl -cd build + +# use python3 as interpreter +sed -i "s|env python|python3|g" htmlreport/cppcheck-htmlreport %check +export CXXFLAGS="%{optflags}" %make_jobs check %install -install -m 0755 -D build/bin/cppcheck %{buildroot}%{_bindir}/cppcheck -install -m 0755 -D htmlreport/cppcheck-htmlreport %{buildroot}%{_bindir}/cppcheck-htmlreport -install -m 0755 -D build/bin/cppcheck-gui %{buildroot}%{_bindir}/cppcheck-gui -install -m 0644 -D cppcheck.1 %{buildroot}%{_mandir}/man1/cppcheck.1 +install -Dpm 0755 build/bin/cppcheck \ + %{buildroot}%{_bindir}/cppcheck +install -Dpm 0755 htmlreport/cppcheck-htmlreport \ + %{buildroot}%{_bindir}/cppcheck-htmlreport +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 -m 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} +install -pm 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} %files %doc AUTHORS @@ -108,7 +110,7 @@ install -m 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} %{_bindir}/cppcheck %{_bindir}/cppcheck-htmlreport %{_datadir}/%{name}/ -%{_mandir}/man1/cppcheck.1* +%{_mandir}/man1/cppcheck.1%{?ext_man} %files gui %{_bindir}/cppcheck-gui