From 71f18d425c83e93626f95540f665cdffa5c0486a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:46 +0000 Subject: [PATCH 01/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b7a4f3..cfaf8f0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := cppad SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ee76b9e621dd87856b9ca29d6bffd73662dbdc06 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:46:00 +0000 Subject: [PATCH 02/12] Initialize branch EL-6 for cppad --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 9a8dd639e4fc704a9140f4cc311ffa6874699848 Mon Sep 17 00:00:00 2001 From: "Bradley M. Bell" Date: Thu, 8 Jul 2010 18:09:12 +0000 Subject: [PATCH 03/12] copy from devel to EPL-5 --- .cvsignore | 2 +- cppad.spec | 85 ++++++++++++++++++++---------------------------------- sources | 2 +- 3 files changed, 33 insertions(+), 56 deletions(-) diff --git a/.cvsignore b/.cvsignore index a4a90fa..d943cbd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cppad-20090303.0.gpl.tgz +cppad-20100101.4.gpl.tgz diff --git a/cppad.spec b/cppad.spec index b8c8682..287097e 100644 --- a/cppad.spec +++ b/cppad.spec @@ -1,7 +1,3 @@ -# ---------------------------------------------------------------------------- -# RPM source for this version of cppad.spec: -# http://www.seanet.com/~bradbell/cppad/cppad-%{version}-%{release}.fc7.src.rpm -# ---------------------------------------------------------------------------- # Known Problems: # # After installation of cppad-doc-%{version} the command @@ -15,8 +11,8 @@ # ---------------------------------------------------------------------------- Name: cppad -Version: 20090303.0 -Release: 5%{?dist} +Version: 20100101.4 +Release: 1%{?dist} Summary: No base package is installed, see %{name}-devel Group: Development/Libraries @@ -62,47 +58,6 @@ as a single web page, in both html and xml, can be found at that web site. %prep %setup -q -# Patch problems fix in trunk on 20090606, but not yet in any release -# This grep should fail once the version passes 20090606 -grep 'x\[2\] = 5.0; x\[2\] = 5.0;' test_more/jacobian.cpp -# This patch will no longer be needed once the version passes 20090606 -sed -i.stamp test_more/jacobian.cpp \ - -e 's/x\[2\] = 5.0; x\[2\] = 5.0;/x[1] = 5.0; x[2] = 5.0;/' -# This patch will no longer be needed once the version passes 20090606 -sed -i.stamp cppad/local/default.hpp \ - -e 's/AD::AD(void) :/& value_(Base(0)), /' - -# This patch will no longer be needed once branches/sweep is merged into -# the CppAD trunk (date is as yet unknown). -sed -i.stamp cppad/local/fun_construct.hpp \ - -e '/for(i = 0; i < m; i++)/,$d' -cat << EOF >> cppad/local/fun_construct.hpp -# ifndef NDEBUG - for(i = 0; i < m; i++) if( taylor_[dep_taddr_[i]] != y[i].value_ ) - { using std::endl; - std::ostringstream buf; - buf << "A dependent variable value is not equal to " - << "its tape evaluation value (perhaps it is nan)" << endl - << "Dependent variable value = " - << y[i].value_ << endl - << "Tape evaluation value = " - << taylor_[dep_taddr_[i]] << endl - << "Difference = " - << y[i].value_ - taylor_[dep_taddr_[i]] << endl - ; - CPPAD_ASSERT_KNOWN( - 0, - buf.str().c_str() - ); - } -# endif -} - -} // END CppAD namespace - -# endif -EOF - # change example/example.cpp to print out machine epsilon cat << EOF > example.sed /^int main(void)/N @@ -115,9 +70,6 @@ int main(void)\\ EOF sed -i.stamp example/example.cpp -f example.sed -# See Sat Jan 12 2008 log entry -sed -i.stamp speed/example/example.cpp -e '/Run(speed_test,/d' - # Remove setting of permissions in documentation destination directory. # Create the doc_prefix directory (if it does not already exist). # (Note we are not using a postfix directory, so can overwrite its case.) @@ -140,11 +92,16 @@ make install DESTDIR=$RPM_BUILD_ROOT %check example/example test_more/test_more -speed/cppad/cppad correct 123 true -speed/cppad/cppad correct 123 false -speed/double/double correct 123 true speed/example/example -speed/profile/profile correct 123 true +speed/double/double correct 123 +speed/cppad/cppad correct 123 +speed/cppad/cppad correct 123 optimize +speed/cppad/cppad correct 123 retape +speed/cppad/cppad correct 123 optimize retape +speed/profile/profile correct 123 +speed/profile/profile correct 123 optimize +speed/profile/profile correct 123 retape +speed/profile/profile correct 123 optimize retape %clean # cleanup @@ -161,6 +118,26 @@ rm -rf $RPM_BUILD_ROOT # ---------------------------------------------------------------------------- %changelog +* Thu Jul 08 2010 Brad Bell - 20100101.4-1 +- Use new upstream source which has bug fix at revision +- https://projects.coin-or.org/CppAD/changeset/1698 + +* Wed Mar 31 2010 Brad Bell - 20100101.2-1 +- Use new upstream source with bug fixes at revision +- https://projects.coin-or.org/CppAD/changeset/1664 +- and remove patch from Wed Feb 10 2010. + +* Wed Feb 10 2010 Brad Bell - 20100101.0-2 +- Patch sources for bug fix between 20100101.0 and 20100101.1. +- This should no longer be necessary once a new upstream source is loaded. + +* Sat Jan 01 2010 Brad Bell - 20100101.0-1 +- Use new upstream source. +- Remove out of date comment about where this spec file is maintained. +- Remove patches that are no longer necessary in prep section. +- Change calling sequence for correctness of speed tests (we do not run speed +- tests, that requires a computer with no other processes running). + * Fri Jul 24 2009 Fedora Release Engineering - 20090303.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index d89508f..1aadac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d34e093cb4b59b87b73a1b38597e45ac cppad-20090303.0.gpl.tgz +ff39d739635985ee78c7572f6ec9b03c cppad-20100101.4.gpl.tgz From 6020dc938d657cb5a0a7aa17041f2cc2a418b440 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:14:53 +0000 Subject: [PATCH 04/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cfaf8f0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cppad -# $Id$ -NAME := cppad -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 88768bfa25278da939e01614fc0869be698772b5 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Mon, 17 Jan 2011 15:09:11 -0800 Subject: [PATCH 05/12] avoid merge conflicts by copying master branch files --- .gitignore | 2 +- cppad.spec | 68 ++++++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d943cbd..d816b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -cppad-20100101.4.gpl.tgz +cppad-20110101.2.gpl.tgz diff --git a/cppad.spec b/cppad.spec index 287097e..5860625 100644 --- a/cppad.spec +++ b/cppad.spec @@ -11,7 +11,7 @@ # ---------------------------------------------------------------------------- Name: cppad -Version: 20100101.4 +Version: 20110101.2 Release: 1%{?dist} Summary: No base package is installed, see %{name}-devel @@ -56,7 +56,25 @@ as a single web page, in both html and xml, can be found at that web site. # ---------------------------------------------------------------------------- %prep + %setup -q +# CppAD tests the distribution before installing it. The rpm system can +# test after a mock installation. Thus, we should remove the distribution copy +# of the include file directory from the search path. We must skip +# speed/src/makefile.in because we build its library before the install. +for file in `find . -name 'makefile.in'` +do + if ! (echo $file | grep 'speed/src/makefile.in' > /dev/null) + then + sed -i "$file" \ + -e "s|-I\$(top_srcdir)\([^/]\)|-I$RPM_BUILD_ROOT/usr/include\1|" + fi +done + + +# Remove setting of permissions in documentation destination directory. +sed -i.stamp makefile.in -e '/chmod -R [^ ]* $(doc_package)/d' +# # change example/example.cpp to print out machine epsilon cat << EOF > example.sed @@ -70,19 +88,8 @@ int main(void)\\ EOF sed -i.stamp example/example.cpp -f example.sed -# Remove setting of permissions in documentation destination directory. -# Create the doc_prefix directory (if it does not already exist). -# (Note we are not using a postfix directory, so can overwrite its case.) -sed -i.stamp makefile.am \ - -e '/chmod -R .* $(doc_package)/d' -sed -i.stamp makefile.in \ - -e '/chmod -R .* $(doc_package)/d' - %build -%configure --with-Documentation \ - --with-Example \ - --with-TestMore \ - --with-Speed +%configure --with-Documentation make %{?_smp_mflags} %install @@ -90,18 +97,9 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check -example/example -test_more/test_more -speed/example/example -speed/double/double correct 123 -speed/cppad/cppad correct 123 -speed/cppad/cppad correct 123 optimize -speed/cppad/cppad correct 123 retape -speed/cppad/cppad correct 123 optimize retape -speed/profile/profile correct 123 -speed/profile/profile correct 123 optimize -speed/profile/profile correct 123 retape -speed/profile/profile correct 123 optimize retape +# make test uses a shell script to run make test is a list of subdirectories +# and it it is unclear how to do: make %{?_smp_mflags} test +make test %clean # cleanup @@ -111,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING ChangeLog AUTHORS uw_copy_040507.html %{_includedir}/%{name} +%{_libdir}/pkgconfig/%{name}.pc %files doc %defattr(-,root,root,-) @@ -118,6 +117,25 @@ rm -rf $RPM_BUILD_ROOT # ---------------------------------------------------------------------------- %changelog +* Mon Jan 17 2011 Brad Bell - 20110101.2-1 +- The fedora source 20110101.0 has the worng check sum, get new upstream source. +- Remove sed patches for problems that were fixed in upstream source. +- Change makefile.in so tests include from install (not distribute) directory +- (see comments above `find . -name 'makefile.in` above). + +* Sat Jan 09 2011 Brad Bell - 20110101.0-2 +- Remove include/cppad_ipopt_nlp.hpp from distribution. +- Remove lib/libspeed.a from distribution. +- Add lib/pkgconfig/cppad.pc to files section (because it is installed). +- Use a single sed script file with comments to do all the makefile.in edits. +- Remove edits of makefile.am (not used so not reason to patch it). + +* Sat Jan 08 2011 Brad Bell - 20110101.0-1 +- Use new major version for 2011. +- abs_top_builddir is missing from definitions in makefile.in +- (should be fixed in future versions of cppad). +- The single command "make test" now builds and runs all the tests. + * Thu Jul 08 2010 Brad Bell - 20100101.4-1 - Use new upstream source which has bug fix at revision - https://projects.coin-or.org/CppAD/changeset/1698 diff --git a/sources b/sources index 1aadac6..a305c9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff39d739635985ee78c7572f6ec9b03c cppad-20100101.4.gpl.tgz +c3481a2b39c1a1744386afd0d6a99633 cppad-20110101.2.gpl.tgz From 8784b9536d2f02adbc87696413dba41eef734eb9 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Wed, 9 Jan 2013 00:53:22 -0700 Subject: [PATCH 06/12] copy from master --- cppad.spec | 136 ++++++++++++++++++++++++++--------------------------- sources | 2 +- 2 files changed, 68 insertions(+), 70 deletions(-) diff --git a/cppad.spec b/cppad.spec index 53cc5ad..fcdf60d 100644 --- a/cppad.spec +++ b/cppad.spec @@ -1,24 +1,27 @@ -# rpmlint command and output -# -# rpmlint --version -# rpmlint version 1.4 Copyright (C) 1999-2007 Frederic Lepied, Mandriva -# -# rpmlint cppad-devel-20120101.1-1.fc15.noarch.rpm -# 1 packages and 0 specfiles checked; 0 errors, 0 warnings. +# rpmlint --version +# rpmlint version 1.4 Copyright (C) 1999-2007 Frederic Lepied, Mandriva # +# rmplint cppad.sped +# cppad.spec: ... W: rpm-buildroot-usage ... +# 0 packages and 1 specfiles checked; 0 errors, 1 warnings. +# search for 'rpm-buildroot-usage' and see comments near there. # ---------------------------------------------------------------------------- Name: cppad -Version: 20120101.1 +Version: 20130000.1 Release: 1%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc +# Only noarch.rpms provided. +# Nothing useful in *debuginfo +%global debug_package %{nil} + Group: Development/Libraries -License: GPLv2 +License: GPLv3 URL: http://www.coin-or.org/CppAD/ Source: http://www.coin-or.org/download/source/CppAD/%{name}-%{version}.gpl.tgz -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cmake >= 2.6 %description C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. @@ -26,6 +29,7 @@ C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. # --------------------------------------------------------------------------- %package devel Summary: The %{name} C++ include files for Algorithmic Differentiation (AD) +BuildArch: noarch Group: Development/Libraries Provides: %{name} = %{version}-%{release} @@ -41,8 +45,9 @@ See the package %{name}-doc for documentation of this version of %{name}. # ---------------------------------------------------------------------------- %package doc -Summary: Documentation for %{name} -Group: XML documentation for %{name}-devel +Summary: Documentation for %{name}-devel +Group: Documentation +BuildArch: noarch %description doc The %{name}-doc package installs the XML documentation for %{name}-devel in @@ -57,56 +62,14 @@ as a single web page, in both HTML and XML, can be found at that web site. %prep %setup -q + +# Replace cppad_SOURCE_DIR by the system include directory so that +# installed files, instead of local files, are used for testing. +# (Note next line generates rpm-buildroot-usage warning from rpmlint.) includedir=%{buildroot}%{_includedir} - -# This patch should no longer be necessary when %%{version} >= 20120101.2 sed \ --e 's|namespace *CppAD *{|# include \n&|' \ - -i cppad/speed/sparse_evaluate.hpp - -# This patch should no longer be necessary when %%{version} >= 20120101.2 -# 1.Fix missing inclusion of pthread library in linker command. -# Fix running make in source directory (current cppad testing runs configure -# and make in a separate directory). -sed \ - -e '/^AM_LDFLAGS *=/s|$| $(PTHREAD_LIB)|' \ - -e '/^dist_noinst_SCRIPTS *= *test.sh/d' \ - -e '/^test.sh:/d' \ - -e '/cp $(srcdir)\/test.sh/d' \ - -e 's|^test:.*|test: check|' \ - -i multi_thread/makefile.in - -# This patch should no longer be necessary when %%{version} >= 20120101.2 -# 1. Since building in source directory, there is no reason to copy the created -# cppad/configure.hpp to the source directory (avoids warning). -# 2. make sure we do not delete multi_thread/test.sh which is -# not created by 'make test' (becasue of patch to multi_thread/makefile.in). -# 3. Use make test instead of make test.sh because we do note make test.sh -# for multi_thread directory. -sed \ - -e '/^$(top_srcdir)\/cppad\/configure.hpp:/d' \ - -e '/^\tcp cppad\/configure.hpp/d' \ - -e '/^\t\trm -f $$dir\/test.sh/d' \ - -e 's|make test.sh|make test|' \ - -e '/echo ".\/test.sh"/d' \ - -i makefile.in - -# CppAD tests the distribution before installing it. The rpm system can test -# after 'make install'. We test the installed instead of distributed copy -# of the include files. We skip speed/src/makefile.in -# because they build programs a library before 'make install' completes. -for file in `find . -name 'makefile.in'` -do - if ! (echo $file | grep 'speed/src/makefile.in' > /dev/null) - then - sed -e "s|-I\$(top_srcdir)\([^/]\)|-I$includedir\1|" -i "$file" - fi -done - -# Remove setting of permissions in documentation destination directory. -sed -e '/^.CppAD_DOCUMENTATION_TRUE.\tchmod -R [^ ]* $(doc_package)/d' \ - -i.stamp makefile.in -# +-e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ + -i.stamp CMakeLists.txt # change example/example.cpp to print out machine epsilon cat << EOF > example.sed @@ -120,18 +83,23 @@ int main(void)\\ EOF sed -i.stamp example/example.cpp -f example.sed +# See https://fedoraproject.org/wiki/Packaging:Cmake?rd=Packaging/cmake +# for suggestions on using cmake. %build -%configure --with-Documentation OPENMP_FLAGS=-fopenmp +%cmake \ + -D CMAKE_VERBOSE_MAKEFILE=0 \ + -D cppad_documentation=YES \ + -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ + . make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +# use the installed include files to compile and run the tests %check -# make test uses a shell script to run test is a list of subdirectories -# and it it is unclear how to do: make %{?_smp_mflags} test -make test +make check %clean # cleanup @@ -149,6 +117,36 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog +* Tue Jan 08 2013 Brad Bell - 20130000.1-1 +- Use a new upstream source. +- Remove the patches that were fixed in the upstream source. +- Convert tabs to spaces (avoid rpmlint warning). +- Fix rpmlint warning for cppad-doc group warning. +- Add comment for rpmlint warning about using buildroot. + +* Sat Jan 05 2013 Brad Bell - 20130000.0-3 +- The patch.sed script in this file is for a final test of a solution on the +- remote machine. Expect to modify upstream source so it is not necessary. + +* Fri Jan 04 2013 Brad Bell - 20130000.0-2 +- Debugging build to try to understand failure of test_more/epsilon.cpp +- on a remote machine that I do not have access to. + +* Fri Jan 04 2013 Brad Bell - 20130000.0-1 +- Advance to version 2013 of cppad. +- Remove old patches that are no longer necessary. +- Convert from auto-tools to cmake build system. +- Add new patches (using sed in setup section) that are now necessary. +- Fix some bogus dates in change log by changing day of the week. +- Getting folloing incorrect warning from g++ during rpmbuild: +- .../cppad/thread_alloc.hpp:203:44: ... subsrcipt is above array bounds ... + +* Sun Oct 21 2012 Ralf Corsépius - 20120101.1-3 +- Switch to arch'ed BuildArch. + +* Wed Jul 18 2012 Fedora Release Engineering - 20120101.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jan 18 2012 Brad Bell - 20120101.1-1 - Advance to version 2012 of cppad. - Remove old patches that are no longer necessary. @@ -163,7 +161,7 @@ rm -rf %{buildroot} * Tue Feb 08 2011 Fedora Release Engineering - 20110101.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Tue Jan 19 2011 Brad Bell - 20110101.2-3 +* Wed Jan 19 2011 Brad Bell - 20110101.2-3 - Remove duplicate test results from build.log - Improve comments before patching top level makefile.in. - Fix rpmlint warnings about %%{_docdir}, %%{name}, and %%{version} in comments. @@ -185,7 +183,7 @@ rm -rf %{buildroot} - Change makefile.in so tests include from install (not distribute) directory - (see comments above `find . -name 'makefile.in` above). -* Sat Jan 09 2011 Brad Bell - 20110101.0-2 +* Sun Jan 09 2011 Brad Bell - 20110101.0-2 - Remove include/cppad_ipopt_nlp.hpp from distribution. - Remove lib/libspeed.a from distribution. - Add lib/pkgconfig/cppad.pc to files section (because it is installed). @@ -211,7 +209,7 @@ rm -rf %{buildroot} - Patch sources for bug fix between 20100101.0 and 20100101.1. - This should no longer be necessary once a new upstream source is loaded. -* Sat Jan 01 2010 Brad Bell - 20100101.0-1 +* Fri Jan 01 2010 Brad Bell - 20100101.0-1 - Use new upstream source. - Remove out of date comment about where this spec file is maintained. - Remove patches that are no longer necessary in prep section. @@ -225,7 +223,7 @@ rm -rf %{buildroot} - Patch cppad/local/fun_construct.hpp to give a more useful error message - (so we can figure out why the Fedora 11 build is failing). -* Mon Jun 06 2009 Brad Bell 20090303-3 +* Sat Jun 06 2009 Brad Bell 20090303-3 - Patch file test_more/jacobian.cpp (required for versions below 20090606). - Patch file cppad/local/default.hpp (required for versions below 20090606). - Fix version (change 20080303 to 20090303) in previous two log entries. @@ -242,7 +240,7 @@ rm -rf %{buildroot} * Tue Feb 24 2009 Fedora Release Engineering - 20080826.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Tue Oct 08 2008 Brad Bell 20080826-1 +* Wed Oct 08 2008 Brad Bell 20080826-1 - Change to newer version of cppad. - Change download directory to standard coin-or location. - Remove editing of speed/main.cpp (no longer necessary). diff --git a/sources b/sources index 090db7a..aab2034 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3237092cdcbfb38600baeb49531fbfe cppad-20120101.1.gpl.tgz +9aa7d3a8cf0bfb892579d736f18ea358 cppad-20130000.1.gpl.tgz From 03c5ce3fc15a2b49609ae44732b58f28c8d37004 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Fri, 18 Jan 2013 03:52:58 -0800 Subject: [PATCH 07/12] Use auto-tools for build because there seems to be a bug in cmake for el6 that Red-Hat has decided not to fix. will not fix in el --- cppad.spec | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/cppad.spec b/cppad.spec index fcdf60d..76b2959 100644 --- a/cppad.spec +++ b/cppad.spec @@ -9,7 +9,7 @@ Name: cppad Version: 20130000.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc # Only noarch.rpms provided. @@ -21,7 +21,6 @@ License: GPLv3 URL: http://www.coin-or.org/CppAD/ Source: http://www.coin-or.org/download/source/CppAD/%{name}-%{version}.gpl.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake >= 2.6 %description C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. @@ -63,13 +62,17 @@ as a single web page, in both HTML and XML, can be found at that web site. %setup -q -# Replace cppad_SOURCE_DIR by the system include directory so that +# We will replace top_srcdir by the system include directory so that # installed files, instead of local files, are used for testing. # (Note next line generates rpm-buildroot-usage warning from rpmlint.) includedir=%{buildroot}%{_includedir} -sed \ --e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ - -i.stamp CMakeLists.txt +for file in `find . -name 'makefile.in'` +do + if ! (echo $file | grep 'speed/src/makefile.in' > /dev/null) + then + sed -e "s|-I\$(top_srcdir)\([^/]\)|-I$includedir\1|" -i "$file" + fi +done # change example/example.cpp to print out machine epsilon cat << EOF > example.sed @@ -86,11 +89,13 @@ sed -i.stamp example/example.cpp -f example.sed # See https://fedoraproject.org/wiki/Packaging:Cmake?rd=Packaging/cmake # for suggestions on using cmake. %build -%cmake \ - -D CMAKE_VERBOSE_MAKEFILE=0 \ - -D cppad_documentation=YES \ - -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ - . +./configure \ + --prefix='/usr' \ + CXX_FLAGS='-Wall -ansi -pedantic-errors -std=c++98' \ + OPENMP_FLAGS='-fopenmp' \ + --with-sparse_list \ + --with-Documentation + make %{?_smp_mflags} %install @@ -99,7 +104,7 @@ make install DESTDIR=%{buildroot} # use the installed include files to compile and run the tests %check -make check +make test %clean # cleanup @@ -117,6 +122,12 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog +* Thu Jan 17 2013 Brad Bell - 20130000.1-1 +- Change build from using cmake to using auto-tools because Red-Hat +- will not fix problems with cmake 2.6; see +- https://bugzilla.redhat.com/show_bug.cgi?id=896116 +- (cmake mailing list suggests upgrading to 2.8) + * Tue Jan 08 2013 Brad Bell - 20130000.1-1 - Use a new upstream source. - Remove the patches that were fixed in the upstream source. From d1aec3235810c3994de353077429797e8a0762bb Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Fri, 31 Jan 2014 04:15:14 -0800 Subject: [PATCH 08/12] Advance to version 2014 of cppad. - Add link to bug report about cmake not working on el6 --- .gitignore | 1 + cppad.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d1c10db..399ca6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cppad-20110101.5.gpl.tgz cppad-20120101.1.gpl.tgz +/cppad-20140000.2.gpl.tgz diff --git a/cppad.spec b/cppad.spec index 76b2959..9ecbaa6 100644 --- a/cppad.spec +++ b/cppad.spec @@ -8,8 +8,8 @@ # ---------------------------------------------------------------------------- Name: cppad -Version: 20130000.1 -Release: 2%{?dist} +Version: 20140000.2 +Release: 1%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc # Only noarch.rpms provided. @@ -86,8 +86,8 @@ int main(void)\\ EOF sed -i.stamp example/example.cpp -f example.sed -# See https://fedoraproject.org/wiki/Packaging:Cmake?rd=Packaging/cmake -# for suggestions on using cmake. +# See https://bugzilla.redhat.com/show_bug.cgi?id=896116 +# for why we are using auto-tools instead of cmake. %build ./configure \ --prefix='/usr' \ @@ -122,6 +122,10 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog +* Fri Jan 31 2014 Brad Bell - 20140000.2-1 +- Advance to version 2014 of cppad. +- Add link to bug report about cmake not working on el6 + * Thu Jan 17 2013 Brad Bell - 20130000.1-1 - Change build from using cmake to using auto-tools because Red-Hat - will not fix problems with cmake 2.6; see diff --git a/sources b/sources index aab2034..2c939a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9aa7d3a8cf0bfb892579d736f18ea358 cppad-20130000.1.gpl.tgz +5c2973e0a399167f4edc6551aa5e2432 cppad-20140000.2.gpl.tgz From bb0f6f5002007f7b5f4e1babe6293563a8bd58b7 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Thu, 6 Mar 2014 03:30:17 -0800 Subject: [PATCH 09/12] convert from using auto-tools to cmake28 --- cppad.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cppad.spec b/cppad.spec index 9ecbaa6..a969952 100644 --- a/cppad.spec +++ b/cppad.spec @@ -9,7 +9,7 @@ Name: cppad Version: 20140000.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc # Only noarch.rpms provided. @@ -21,6 +21,7 @@ License: GPLv3 URL: http://www.coin-or.org/CppAD/ Source: http://www.coin-or.org/download/source/CppAD/%{name}-%{version}.gpl.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cmake28 %description C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. @@ -62,17 +63,13 @@ as a single web page, in both HTML and XML, can be found at that web site. %setup -q -# We will replace top_srcdir by the system include directory so that +# Replace cppad_SOURCE_DIR by the system include directory so that # installed files, instead of local files, are used for testing. # (Note next line generates rpm-buildroot-usage warning from rpmlint.) includedir=%{buildroot}%{_includedir} -for file in `find . -name 'makefile.in'` -do - if ! (echo $file | grep 'speed/src/makefile.in' > /dev/null) - then - sed -e "s|-I\$(top_srcdir)\([^/]\)|-I$includedir\1|" -i "$file" - fi -done +sed \ +-e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ + -i.stamp CMakeLists.txt # change example/example.cpp to print out machine epsilon cat << EOF > example.sed @@ -86,15 +83,14 @@ int main(void)\\ EOF sed -i.stamp example/example.cpp -f example.sed -# See https://bugzilla.redhat.com/show_bug.cgi?id=896116 -# for why we are using auto-tools instead of cmake. +# See https://fedoraproject.org/wiki/Packaging:Cmake?rd=Packaging/cmake +# for suggestions on using cmake. %build -./configure \ - --prefix='/usr' \ - CXX_FLAGS='-Wall -ansi -pedantic-errors -std=c++98' \ - OPENMP_FLAGS='-fopenmp' \ - --with-sparse_list \ - --with-Documentation +%cmake28 \ + -D CMAKE_VERBOSE_MAKEFILE=0 \ + -D cppad_documentation=YES \ + -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ + . make %{?_smp_mflags} @@ -104,7 +100,7 @@ make install DESTDIR=%{buildroot} # use the installed include files to compile and run the tests %check -make test +make check %clean # cleanup @@ -122,6 +118,10 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog +* Wed Mar 05 2014 Brad Bell - 20140000.2-2 +- Swith to using cmake28 as suggest in Comment 3 on +- https://bugzilla.redhat.com/show_bug.cgi?id=896116#c3 + * Fri Jan 31 2014 Brad Bell - 20140000.2-1 - Advance to version 2014 of cppad. - Add link to bug report about cmake not working on el6 From 9bce3b4605b45e2faec0e7fa42d4c958dfcc3662 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Thu, 6 Mar 2014 03:45:04 -0800 Subject: [PATCH 10/12] change tab to spaces --- cppad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppad.spec b/cppad.spec index a969952..21c4920 100644 --- a/cppad.spec +++ b/cppad.spec @@ -90,7 +90,7 @@ sed -i.stamp example/example.cpp -f example.sed -D CMAKE_VERBOSE_MAKEFILE=0 \ -D cppad_documentation=YES \ -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ - . + . make %{?_smp_mflags} From bb9d87432b1c577a8ce5b5e78369d6f5dd85e10d Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Sat, 7 Feb 2015 06:40:28 -0700 Subject: [PATCH 11/12] Merge in master branch with changes to cppad.spec that are necessary for rel6 (see cppad.spec changelog for 20150000.4-3). These changes are intended to be merged back into master and f20, f21. --- .gitignore | 12 +++++ cppad.spec | 139 +++++++++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 122 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 399ca6b..5b03613 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,15 @@ +# ignore swap files created by vim editor +*.swp +# ignore rpm files created by fedpkg srpm +*.rpm +# ignore result drectory created by fedpkg mockbuild +results_cppad +# tarballs cppad-20110101.5.gpl.tgz cppad-20120101.1.gpl.tgz +/cppad-20130000.0.gpl.tgz +/cppad-20130000.1.gpl.tgz +/cppad-20130000.2.gpl.tgz +/cppad-20130000.3.gpl.tgz /cppad-20140000.2.gpl.tgz +/cppad-20150000.4.gpl.tgz diff --git a/cppad.spec b/cppad.spec index 21c4920..33c6feb 100644 --- a/cppad.spec +++ b/cppad.spec @@ -1,18 +1,25 @@ -# rpmlint --version -# rpmlint version 1.4 Copyright (C) 1999-2007 Frederic Lepied, Mandriva +# ---------------------------------------------------------------------------- +# The comamnds 'rpmlint cppad.spec' and 'fedpkg lint' generate the warning: # -# rmplint cppad.sped -# cppad.spec: ... W: rpm-buildroot-usage ... -# 0 packages and 1 specfiles checked; 0 errors, 1 warnings. -# search for 'rpm-buildroot-usage' and see comments near there. -# ---------------------------------------------------------------------------- +# cppad.spec:71: W: rpm-buildroot-usage +# %%prep includedir=%%{buildroot}%%{_includedir} +# +# See http://comments.gmane.org/gmane.linux.redhat.fedora.devel/144920 +# ---------------------------------------------------------------------------- +# The command 'fedpkg lint' generates the following warnings: +# +# W: spelling-error Summary(en_US) devel -> delve, devil, revel +# W: spelling-error %%description -l en_US devel -> delve, devil, revel +# +# These uses of devel refer to cppad-devel and hence are not spelling errors. +# ---------------------------------------------------------------------------- Name: cppad -Version: 20140000.2 -Release: 2%{?dist} +Version: 20150000.4 +Release: 3%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc -# Only noarch.rpms provided. +# Only noarch.rpms provided. The user can compile with or without debugging # Nothing useful in *debuginfo %global debug_package %{nil} @@ -21,7 +28,7 @@ License: GPLv3 URL: http://www.coin-or.org/CppAD/ Source: http://www.coin-or.org/download/source/CppAD/%{name}-%{version}.gpl.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake28 +BuildRequires: cmake >= 2.8 %description C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. @@ -51,7 +58,7 @@ BuildArch: noarch %description doc The %{name}-doc package installs the XML documentation for %{name}-devel in - %{_docdir}/%{name}-%{version} + %{_docdir}/%{name} Links to an HTML version of the %{name} documentation, for the most recent version of %{name}, can be found at the web site http://www.coin-or.org/CppAD/ @@ -65,11 +72,31 @@ as a single web page, in both HTML and XML, can be found at that web site. # Replace cppad_SOURCE_DIR by the system include directory so that # installed files, instead of local files, are used for testing. -# (Note next line generates rpm-buildroot-usage warning from rpmlint.) +# includedir=%{buildroot}%{_includedir} sed \ -e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ -i.stamp CMakeLists.txt +# +# Make speed/src/libspeed_src a static instead of shared library. +# This should be fixed in the upstream source and not necessary next year. +sed \ +-e 's|ADD_LIBRARY(speed_src|& STATIC|' \ + -i.stamp speed/src/CMakeLists.txt + +# Remove installation of cppad_colpack.cpp becasue it is not used +# by the Fedora installation. This should be fixed in the upstream source +# and not necessary next year; i.e., 2016. +cat << EOF > CMakeLists.sed +/^INSTALL/! b skip +N +/cppad_colpack.cpp/! b skip +N +N +d +: skip +EOF +sed -f CMakeLists.sed -i CMakeLists.txt # change example/example.cpp to print out machine epsilon cat << EOF > example.sed @@ -84,14 +111,29 @@ EOF sed -i.stamp example/example.cpp -f example.sed # See https://fedoraproject.org/wiki/Packaging:Cmake?rd=Packaging/cmake -# for suggestions on using cmake. +# and http://www.coin-or.org/CppAD/Doc/cmake.htm %build -%cmake28 \ - -D CMAKE_VERBOSE_MAKEFILE=0 \ - -D cppad_documentation=YES \ - -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ +# +# Cannot use %%{_includedir}, or %%{_docdir} because they are absolute. +# Relative values would be more flexible because they can be combined with +# %%{_prefix} to get absolute values. +%cmake --version +%cmake \ + -D CMAKE_VERBOSE_MAKEFILE=0 \ + \ + -D cmake_install_prefix=%{_prefix} \ + -D cmake_install_includedirs=include \ + -D cmake_install_datadir=share \ + -D cmake_install_docdir=share/doc \ + \ + -D cppad_cxx_flags='-Wall -ansi -pedantic-errors -std=c++98 -Wshadow' \ + -D cppad_test_vector=cppad \ + -D cppad_max_num_theads=64 \ + -D cppad_sparse_list=YES \ + -D cppad_tape_id_type=size_t \ + -D cppad_tape_addr_type=size_t \ + -D cppad_implicit_ctor_from_any_type=NO \ . - make %{?_smp_mflags} %install @@ -114,23 +156,60 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} +%{_docdir}/%{name} # ---------------------------------------------------------------------------- %changelog -* Wed Mar 05 2014 Brad Bell - 20140000.2-2 -- Swith to using cmake28 as suggest in Comment 3 on -- https://bugzilla.redhat.com/show_bug.cgi?id=896116#c3 +* Sat Feb 07 2015 Brad Bell - 20150000.4-3 +- Change std=c++11 to std=c++98 so works with rel6 (also so works +- in f20 and f21 when std=c++11 is not specified). +- Change speed/src/libspeed_src to be a static library because it is only +- used for testing (shared library was not being found on epl6). -* Fri Jan 31 2014 Brad Bell - 20140000.2-1 +* Sun Feb 01 2015 Brad Bell - 20150000.4-2 +- Fix rmplint warning about macro-in-comment. +- Edit comments at top of about warnings that won't be fixed. + +* Sat Jan 31 2015 Brad Bell - 20150000.4-1 +- Advance to version 2015 of cppad. +- Ensure cmake >= 2.8; see https://bugzilla.redhat.com/show_bug.cgi?id=896116 +- Remove patch for location of docdir (fixed upstream). +- Patch CMakeLists.txt to remove install of cppad_colpack.cpp (it is not used). +- List all cmake options (including defaults) that are used by this install. + +* Sat Aug 16 2014 Fedora Release Engineering - 20140000.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 20140000.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + + +* Tue Jan 21 2014 Brad Bell - 20140000.2-1 - Advance to version 2014 of cppad. -- Add link to bug report about cmake not working on el6 +- Add link to web discussion about rpm-buildroot-usage warning. +- Fix rpmlint warning about mixing tabs and spaces in spec file. -* Thu Jan 17 2013 Brad Bell - 20130000.1-1 -- Change build from using cmake to using auto-tools because Red-Hat -- will not fix problems with cmake 2.6; see -- https://bugzilla.redhat.com/show_bug.cgi?id=896116 -- (cmake mailing list suggests upgrading to 2.8) +* Mon Oct 07 2013 Brad Bell - 20130000.3-1 +- 1. Use new upstream source to fix warnings generated by g++ 4.8.1. +- 2. As per https://fedoraproject.org/wiki/Changes/UnversionedDocdirs +- move xml documentation from /usr/share/doc/%%{name}-%%{version} to +- /usr/share/doc/%%{name} + +* Sat Aug 03 2013 Fedora Release Engineering - 20130000.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 28 2013 Brad Bell - 20130000.2-1 +- Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=913929 +- in the upstream soruce and use the corresponding upstream release. +- Note, the previous commit, 20130000.1-3, could have been avoided using +- https://fedoraproject.org/wiki/Using_the_Koji_build_system#Scratch_Builds + +* Wed Feb 13 2013 Brad Bell - 20130000.1-3 +- Attempt to reproduce failure reported in bug id=913929 +- (The build logs were deleted because I did not get to this soon enough) + +* Wed Feb 13 2013 Fedora Release Engineering - 20130000.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild * Tue Jan 08 2013 Brad Bell - 20130000.1-1 - Use a new upstream source. diff --git a/sources b/sources index 2c939a4..8149c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c2973e0a399167f4edc6551aa5e2432 cppad-20140000.2.gpl.tgz +1720334972913771209883efd384ea0a cppad-20150000.4.gpl.tgz From 7fcb1f5a1c94ec54ed9ff8d63dae22bcb1d1e2bb Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Mon, 9 Feb 2015 05:47:52 -0700 Subject: [PATCH 12/12] 1. Change an excact equals check to a near equals check (should not always expect exactly equals). 2. Move clean section to beginning in-case mock has cleanup_on_failure set to zero. --- cppad.spec | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/cppad.spec b/cppad.spec index 33c6feb..3171953 100644 --- a/cppad.spec +++ b/cppad.spec @@ -66,6 +66,12 @@ In addition, printable versions of the documentation, as a single web page, in both HTML and XML, can be found at that web site. # ---------------------------------------------------------------------------- + +%clean +# Cleanup build root at the beginning in case mock has +# cleanup_on_failure set to zero. +rm -rf %{buildroot} + %prep %setup -q @@ -78,11 +84,17 @@ sed \ -e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ -i.stamp CMakeLists.txt # -# Make speed/src/libspeed_src a static instead of shared library. -# This should be fixed in the upstream source and not necessary next year. +# Make speed/src/libspeed_src a static instead of shared library. This should +# be fixed in the upstream source and not necessary next year; i.e, 2016. sed \ -e 's|ADD_LIBRARY(speed_src|& STATIC|' \ - -i.stamp speed/src/CMakeLists.txt + -i.stamp speed/src/CMakeLists.txt + +# Fix an exact equal check that should be a near equal check. This should +# be fixed in the upstream source and not necessary next year; i.e, 2016. +sed \ +-e 's|(y\[i\] == check\[i\])|CppAD::NearEqual(y[i], check[i], 1e-10, 1e-10)|' \ + -i.stamp test_more/optimize.cpp # Remove installation of cppad_colpack.cpp becasue it is not used # by the Fedora installation. This should be fixed in the upstream source @@ -144,10 +156,6 @@ make install DESTDIR=%{buildroot} %check make check -%clean -# cleanup -rm -rf %{buildroot} - %files devel %defattr(-,root,root,-) %doc COPYING ChangeLog AUTHORS uw_copy_040507.html @@ -160,11 +168,13 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog -* Sat Feb 07 2015 Brad Bell - 20150000.4-3 -- Change std=c++11 to std=c++98 so works with rel6 (also so works +* Mon Feb 09 2015 Brad Bell - 20150000.4-3 +- 1: Change std=c++11 to std=c++98 so works with rel6 (also so works - in f20 and f21 when std=c++11 is not specified). -- Change speed/src/libspeed_src to be a static library because it is only +- 2: Change speed/src/libspeed_src to be a static library because it is only - used for testing (shared library was not being found on epl6). +- 3: Cleanup %%{buildroot} at start so it can be used for debugging on failure. +- 4: Fix an exact equal check that should have been a near equal check. * Sun Feb 01 2015 Brad Bell - 20150000.4-2 - Fix rmplint warning about macro-in-comment.