[cbmc/f20: 5/5] Merge branch 'master' into f20

[Jerry James]

commit 1bfbc012765dcdf038a523bd8e948e55e27d6e14
Merge: a02688c b587833
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Jun 25 19:37:04 2014 -0600

    Merge branch 'master' into f20

 .gitignore                       |    3 +-
 cbmc-20131201svn-fix-build.patch |   62 -------------------------
 cbmc-4.7-alias.patch             |   40 ++++++++++++++++
 cbmc-4.7-cudd.patch              |   28 +++++++++++
 cbmc-4.7-fix-build.patch         |   93 ++++++++++++++++++++++++++++++++++++++
 cbmc.spec                        |   66 +++++++++++++++++----------
 sources                          |    2 +-
 7 files changed, 205 insertions(+), 89 deletions(-)
---
diff --cc cbmc.spec
index 26e6e1e,e61db44..1ab88ed
--- a/cbmc.spec
+++ b/cbmc.spec
@@@ -55,6 -69,13 +69,10 @@@ mak
  %{_mandir}/man1/cbmc.*
  
  %changelog
+ * Wed Jun 25 2014 Jerry James <loganjerry at gmail.com> - 4.7-1
+ - New upstream release
+ - Build with CUDD support
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6-2.20131201svn
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
  * Sun Dec  1 2013 Shakthi Kannan <shakthimaan [AT] fedoraproject.org> - 4.6-1.20131201svn
  - Updated to upstream 4.6 release