[clipsmm/el6: 11/11] Merge branch 'master' into el6

[Tim Niemueller]

commit 7ee90d4229d38b63dc6cb788a7da6052b252bd98
Merge: e91510c 8895e61
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Thu Sep 27 19:48:24 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	clipsmm.spec

 .gitignore   |    6 +++-
 clipsmm.spec |   60 ++++++++++++++++++++++++++++++++++++++++++---------------
 sources      |    3 +-
 3 files changed, 49 insertions(+), 20 deletions(-)
---
diff --cc clipsmm.spec
index 5ae18fd,b3208a2..34823d6
--- a/clipsmm.spec
+++ b/clipsmm.spec
@@@ -1,7 -1,7 +1,6 @@@
- %define clipsver 6.24
 -%define clipsver 6.30
  Summary:          C++ interface to the CLIPS expert system C library
  Name:             clipsmm
- Version:          0.1.0
+ Version:          0.2.1
  Release:          3%{?dist}
  License:          GPLv3
  URL:              http://clipsmm.sourceforge.net
@@@ -110,13 -117,32 +116,35 @@@ cd unit_test
  
  %files doc
  %defattr(-,root,root,-)
- %doc %{_datadir}/gtk-doc/html/clipsmm-0.1/
- 
+ %doc %{_datadir}/gtk-doc/html/clipsmm-0.2/
+ %dir %{_datadir}/gtk-doc/
+ %dir %{_datadir}/gtk-doc/html/
  
  %changelog
- * Thu Jul  8 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-3
+ * Thu Sep 27 2012 Tim Niemueller <tim at niemueller.de> - 0.2.1-3
+ - Own gtk-doc dir and no longer depend on it, fixes #604341
+ 
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Wed Jan 04 2012 Tim Niemueller <tim at niemueller.de> - 0.2.1-1
+ - Upgrade to 0.2.1, fixes C++0x detection
+ 
+ * Sat Oct 29 2011 Tim Niemueller <tim at niemueller.de> - 0.2.0-1
+ - Upgrade to 0.2.0
+ 
+ * Fri Sep 30 2011 Tim Niemueller <tim at niemueller.de> - 0.1.0-5
+ - Added patch to extend functionality
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
++* Thu Jul  8 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-3el
 +- Rebuilt for EPEL-6
 +
+ * Tue Mar  9 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-3
+ - Add libtermcap dependency for Fedora <= 9 and EL <= 5
+ 
  * Wed Sep  2 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.1.0-2
  - Bump release to rebuild against newer clips