No need for EPEL specifics in spec since cppcheck is included in RHEL8.
This commit is contained in:
parent
4bdd5ae4e2
commit
061eacf9ca
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: cppcheck
|
Name: cppcheck
|
||||||
Version: 2.1
|
Version: 2.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Tool for static C/C++ code analysis
|
Summary: Tool for static C/C++ code analysis
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://cppcheck.wiki.sourceforge.net/
|
URL: http://cppcheck.wiki.sourceforge.net/
|
||||||
@ -28,14 +28,9 @@ BuildRequires: qt5-qtbase-devel
|
|||||||
BuildRequires: qt5-linguist
|
BuildRequires: qt5-linguist
|
||||||
|
|
||||||
%if %{gui}
|
%if %{gui}
|
||||||
%if 0%{?rhel} >= 7
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
|
||||||
BuildRequires: cmake3
|
|
||||||
%else
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: z3-devel >= 4.7.1
|
BuildRequires: z3-devel >= 4.7.1
|
||||||
%endif
|
|
||||||
%else
|
%else
|
||||||
Obsoletes: %{name}-gui < %{version}-%{release}
|
Obsoletes: %{name}-gui < %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
@ -59,12 +54,7 @@ This package contains the graphical user interface for cppcheck.
|
|||||||
%package htmlreport
|
%package htmlreport
|
||||||
Summary: HTML reporting for cppcheck
|
Summary: HTML reporting for cppcheck
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
%if 0%{?rhel} >= 7
|
|
||||||
# RHEL packages aren't versioned
|
|
||||||
Requires: python%{python3_pkgversion}-pygments
|
|
||||||
%else
|
|
||||||
Requires: python3-pygments
|
Requires: python3-pygments
|
||||||
%endif
|
|
||||||
|
|
||||||
%description htmlreport
|
%description htmlreport
|
||||||
This package contains the Python utility for generating html reports
|
This package contains the Python utility for generating html reports
|
||||||
@ -88,11 +78,7 @@ pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number-
|
|||||||
mkdir objdir-%{_target_platform}
|
mkdir objdir-%{_target_platform}
|
||||||
cd objdir-%{_target_platform}
|
cd objdir-%{_target_platform}
|
||||||
# Upstream doesn't support shared libraries (unversioned solib)
|
# Upstream doesn't support shared libraries (unversioned solib)
|
||||||
%if 0%{?rhel} >= 7
|
|
||||||
%cmake3 .. -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DHAVE_RULES=yes -DBUILD_GUI=%{gui} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck
|
|
||||||
%else
|
|
||||||
%cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=yes -DHAVE_RULES=yes -DBUILD_GUI=%{gui} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck
|
%cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=yes -DHAVE_RULES=yes -DBUILD_GUI=%{gui} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck
|
||||||
%endif
|
|
||||||
# SMP make doesn't seem to work
|
# SMP make doesn't seem to work
|
||||||
make cppcheck
|
make cppcheck
|
||||||
|
|
||||||
@ -136,6 +122,9 @@ cd objdir-%{_target_platform}/bin
|
|||||||
%{_bindir}/cppcheck-htmlreport
|
%{_bindir}/cppcheck-htmlreport
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 16 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.1-3
|
||||||
|
- Drop EPEL specifics since cppcheck is included in RHEL8.
|
||||||
|
|
||||||
* Tue Jun 16 2020 Wolfgang Stöggl <c72578@yahoo.de> - 2.1-2
|
* Tue Jun 16 2020 Wolfgang Stöggl <c72578@yahoo.de> - 2.1-2
|
||||||
- Enable Z3 on Fedora builds.
|
- Enable Z3 on Fedora builds.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user