[cppad] Use an unversioned docdir, fix warnings
Bradley M. Bell
bradbell at fedoraproject.org
Tue Oct 8 13:43:37 UTC 2013
commit 7a2711b338505a6c13b582e764a320677d85cb59
Author: Brad Bell <bradbell at seanet.com>
Date: Tue Oct 8 06:42:56 2013 -0700
Use an unversioned docdir, fix warnings
.gitignore | 1 +
cppad.spec | 24 ++++++++++++++++++++----
sources | 2 +-
3 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be33b09..af04631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ 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
diff --git a/cppad.spec b/cppad.spec
index b7ece04..4a86101 100644
--- a/cppad.spec
+++ b/cppad.spec
@@ -8,8 +8,8 @@
# ----------------------------------------------------------------------------
Name: cppad
-Version: 20130000.2
-Release: 2%{?dist}
+Version: 20130000.3
+Release: 1%{?dist}
Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc
# Only noarch.rpms provided.
@@ -51,7 +51,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/
@@ -71,6 +71,13 @@ sed \
-e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \
-i.stamp CMakeLists.txt
+# Temporary patch for Fedora 20 and greater. Upstream plans to change source
+# so not needed when %%{version} is greater than or equal 20140000:
+#
+# Change /usr/share/doc/%%{name}-%%{version} -> /usr/share/doc/%%{name}
+sed -e 's|\(${cppad_abs_docdir}/cppad\)-${cppad_version}|\1|' \
+ -i CMakeLists.txt
+
# change example/example.cpp to print out machine epsilon
cat << EOF > example.sed
/^int main(void)/N
@@ -111,12 +118,21 @@ rm -rf %{buildroot}
%{_includedir}/%{name}
%{_datadir}/pkgconfig/%{name}.pc
+# CMakeLists.txt is assuming %%{_docdir} is the same as %%{_datadir}/doc.
+# In version 20140000, we should should add a -D cmake_install_docdir argument
+# to cmake command so this is no longer necessary.
%files doc
%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+%{_docdir}/%{name}
# ----------------------------------------------------------------------------
%changelog
+* Mon Oct 07 2013 Brad Bell <bradbell at seanet doc com> - 20130000.2-3
+- 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 <rel-eng at lists.fedoraproject.org> - 20130000.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index cec3270..8e24567 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f764be6e3bcc8b201bc4b7a59717cde cppad-20130000.2.gpl.tgz
+7abd0ddc43aa7a3c066461904f5cb459 cppad-20130000.3.gpl.tgz
More information about the scm-commits
mailing list