rpm/cppcheck
SHA256
1
0
Fork 0
forked from pool/cppcheck
Code Pull Requests Activity

Accepting request 661573 from devel:tools

Browse Source 
- Small packaging enhancements

- 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/661573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cppcheck?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2018-12-28 11:35:42 +00:00 committed by Git OBS Bridge
commit dffa1d1ef8
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cppcheck.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 27 10:03:28 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
- Small packaging enhancements
-------------------------------------------------------------------
Thu Dec 20 13:40:09 UTC 2018 - Christoph G <foss@grueninger.de>
- 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 <foss@grueninger.de> Wed Dec 19 21:31:18 UTC 2018 - Christoph G <foss@grueninger.de>

64
cppcheck.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@ -24,14 +24,19 @@ License: GPL-3.0-or-later
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
URL: http://cppcheck.sourceforge.net/ URL: http://cppcheck.sourceforge.net/
Source: https://downloads.sourceforge.net/cppcheck/cppcheck-%{version}.tar.bz2 Source: https://downloads.sourceforge.net/cppcheck/cppcheck-%{version}.tar.bz2
BuildRequires: cmake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pcre-devel BuildRequires: libqt5-linguist-devel
BuildRequires: python BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: xsltproc BuildRequires: xsltproc
Requires: python BuildRequires: pkgconfig(Qt5Core)
Requires: python-Pygments BuildRequires: pkgconfig(Qt5Gui)
Requires: python-xml BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(libpcre)
Requires: python3-Pygments
%description %description
This program tries to detect bugs that your C/C++ compiler don't see. Cppcheck This program tries to detect bugs that your C/C++ compiler don't see. Cppcheck
@ -57,11 +62,6 @@ errors:
%package gui %package gui
Summary: A tool for static C/C++ code analysis Summary: A tool for static C/C++ code analysis
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
Requires: cppcheck Requires: cppcheck
%description gui %description gui
@ -73,34 +73,36 @@ doesn't see.
%setup -q %setup -q
%build %build
make %{?_smp_mflags} \ %cmake \
CXXFLAGS="-DNDEBUG %{optflags}" \ -DCMAKE_CXX_FLAGS="-DNDEBUG %{optflags}" \
SRCDIR=build \ -DBUILD_GUI=ON \
CFGDIR=%{_datadir}/%{name} \ -DBUILD_TESTS=ON \
HAVE_RULES=yes -DHAVE_RULES=yes
pushd gui
%qmake5 \
QMAKE_CXXFLAGS="-DNDEBUG %{optflags}" \
HAVE_RULES=yes
%make_jobs %make_jobs
popd
# does not work with CMake, directly call provided Makefile from source directory
cd ..
make man \ make man \
DB2MAN=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl DB2MAN=%{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
# use python3 as interpreter
sed -i "s|env python|python3|g" htmlreport/cppcheck-htmlreport
%check %check
make %{?_smp_mflags} test \ export CXXFLAGS="%{optflags}"
CXXFLAGS="-DNDEBUG %{optflags}" \ %make_jobs check
HAVE_RULES=yes
%install %install
install -m 0755 -D cppcheck %{buildroot}%{_bindir}/cppcheck install -Dpm 0755 build/bin/cppcheck \
install -m 0755 -D htmlreport/cppcheck-htmlreport %{buildroot}%{_bindir}/cppcheck-htmlreport %{buildroot}%{_bindir}/cppcheck
install -m 0755 -D gui/cppcheck-gui %{buildroot}%{_bindir}/cppcheck-gui install -Dpm 0755 htmlreport/cppcheck-htmlreport \
install -m 0644 -D cppcheck.1 %{buildroot}%{_mandir}/man1/cppcheck.1 %{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 -d %{buildroot}%{_datadir}/%{name}
install -m 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name} install -pm 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name}
%files %files
%doc AUTHORS %doc AUTHORS
@ -108,7 +110,7 @@ install -m 0644 cfg/*.cfg %{buildroot}%{_datadir}/%{name}
%{_bindir}/cppcheck %{_bindir}/cppcheck
%{_bindir}/cppcheck-htmlreport %{_bindir}/cppcheck-htmlreport
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_mandir}/man1/cppcheck.1* %{_mandir}/man1/cppcheck.1%{?ext_man}
%files gui %files gui
%{_bindir}/cppcheck-gui %{_bindir}/cppcheck-gui