[cppcheck/f15] Update to 1.51.

Jussi Lehtola jussilehtola at fedoraproject.org
Sun Oct 9 11:46:30 UTC 2011


commit d008f8ca5a30e538953ce49648b38a21ca99a719
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sun Oct 9 14:46:26 2011 +0300

    Update to 1.51.

 cppcheck-1.50-preprocessor.patch |   43 --------------------------------------
 cppcheck.spec                    |   19 +++++++++++++---
 sources                          |    2 +-
 3 files changed, 16 insertions(+), 48 deletions(-)
---
diff --git a/cppcheck.spec b/cppcheck.spec
index c9f6b28..4a7dbe7 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -1,13 +1,11 @@
 Name:		cppcheck
-Version:	1.50
+Version:	1.51
 Release:	1%{?dist}
 Summary:	A tool for static C/C++ code analysis
 Group:		Development/Languages
 License:	GPLv3+
 URL:		http://cppcheck.wiki.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Fix BZ #730580
-Patch0:		cppcheck-1.50-preprocessor.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	pcre-devel
@@ -26,21 +24,28 @@ various compiler extensions, inline assembly code, etc.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Make sure bundled tinyxml is not used
 rm -r externals/tinyxml
 
 %build
 # TINYXML= prevents use of bundled tinyxml
+%if 0%{?rhel} == 4
+make CXXFLAGS="%{optflags} -I%{_includedir}/pcre -DNDEBUG -DHAVE_RULES" TINYXML= LDFLAGS="-ltinyxml -lpcre" %{?_smp_mflags}
+%else
 make CXXFLAGS="%{optflags} -DNDEBUG -DHAVE_RULES" TINYXML= LDFLAGS="-ltinyxml -lpcre" %{?_smp_mflags}
+%endif
 
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 cppcheck %{buildroot}%{_bindir}/cppcheck
 
 %check
+%if 0%{?rhel} == 4
+make CXXFLAGS="%{optflags} -I%{_includedir}/pcre -DNDEBUG -DHAVE_RULES" TINYXML= LDFLAGS="-ltinyxml -lpcre" %{?_smp_mflags} check
+%else
 make CXXFLAGS="%{optflags} -DNDEBUG -DHAVE_RULES" TINYXML= LDFLAGS="-ltinyxml -lpcre" %{?_smp_mflags} check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +56,12 @@ rm -rf %{buildroot}
 %{_bindir}/cppcheck
 
 %changelog
+* Sun Oct 09 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.51-1
+- Update to 1.51.
+
+* Fri Aug 19 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.50-2
+- Fix build on EPEL-4.
+
 * Sun Aug 14 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.50-1
 - Update to 1.50.
 
diff --git a/sources b/sources
index 30393bd..5bb368a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79ef3898b246ba9c143155d5ad23dbd1  cppcheck-1.50.tar.bz2
+8349ab90472801b9d377cfabf846ca28  cppcheck-1.51.tar.bz2


More information about the scm-commits mailing list