[gecode] Upgrade to 4.2.0. Migrate to unversioned docdirs (bz#993768)

[Julian C. Dunn]

commit 60960570b14014b90f21428456221155594e5170
Author: Julian C. Dunn <jdunn at aquezada.com>
Date:   Fri Aug 23 01:10:43 2013 -0400

    Upgrade to 4.2.0.
    Migrate to unversioned docdirs (bz#993768)

 .gitignore  |    1 +
 gecode.spec |   19 +++++++++++++------
 sources     |    2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1afebf..447f222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gecode-3.7.3.tar.gz
 /gecode-4.0.0.tar.gz
+/gecode-4.2.0.tar.gz
diff --git a/gecode.spec b/gecode.spec
index 6e1eef7..7af8962 100644
--- a/gecode.spec
+++ b/gecode.spec
@@ -1,6 +1,6 @@
 Name:           gecode
-Version:        4.0.0
-Release:        3%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        Generic constraint development environment
 
 Group:          System Environment/Libraries
@@ -16,6 +16,9 @@ BuildRequires:  flex >= 2.5.33
 BuildRequires:  graphviz
 BuildRequires:  qt4-devel
 
+# Fedora < 20 doesn't have this macro
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 # for documentation
 BuildRequires:  doxygen tex(latex) tex(dvips)
 
@@ -101,8 +104,8 @@ mv ChangeLog.new ChangeLog
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #move docs and examples to build root
-mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}
-mv doc/html ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
+mv doc/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
 
 
 %clean
@@ -126,12 +129,16 @@ mv doc/html ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}
 %{_libdir}/*.so
 
 %files doc
-%{_defaultdocdir}/%{name}-doc-%{version}
+%{_pkgdocdir}
 
 %files examples
 %doc examples/*
 
 %changelog
+* Fri Aug 23 2013 Julian C. Dunn <jdunn at aquezada.com> 4.2.0-1
+- Update to 4.2.0
+- Switch to unversioned docdir for >= F20 (bz#993768)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -144,7 +151,7 @@ mv doc/html ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Wed Aug 23 2012 Julian C. Dunn <jdunn at aquezada.com> 3.7.3-3
+* Thu Aug 23 2012 Julian C. Dunn <jdunn at aquezada.com> 3.7.3-3
 - Fix build on EPEL6
 
 * Tue Aug 21 2012 Julian C. Dunn <jdunn at aquezada.com> 3.7.3-2
diff --git a/sources b/sources
index d8b749e..358e743 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d1594b6d431d73bd386b31392b7cfcb  gecode-4.0.0.tar.gz
+24b5af722088b3053d884663950d0d8a  gecode-4.2.0.tar.gz