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

[Devresse]

commit a5f711ba616a76796ab9ea135d408e85b4a21c94
Merge: 2a8ecbf 8f1f7e9
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Tue Mar 11 22:29:08 2014 +0100

    Merge branch 'master' into el6

 .gitignore  |    1 +
 dmlite.spec |   66 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources     |    2 +-
 3 files changed, 55 insertions(+), 14 deletions(-)
---
diff --cc dmlite.spec
index b252488,2ce0a5c..fca8361
--- a/dmlite.spec
+++ b/dmlite.spec
@@@ -107,16 -128,29 +128,33 @@@ rm -rf %{buildroot
  %files docs
  %defattr(-,root,root,-)
  %{_mandir}/man3/*
- %{_defaultdocdir}/%{name}-%{version}
+ %{_pkgdocdir}
+ 
+ 
+ %files -n python-dmlite
+ %defattr(-,root,root,-)
+ %{python_sitearch}/pydmlite.so
  
 +%files -n python-dmlite
 +%defattr(-,root,root,-)
 +%{python_sitearch}/pydmlite.so
 +
  %changelog
- * Fri Nov 29 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-2
+ * Tue Mar 11 2014 Adrien Devresse <adevress at cern.ch> - 0.6.2-1 
+ - dmlite release 0.6.2
+ 
+ * Mon Dec 16 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-6
+ - Supressed dmlite- prefix from the Python package
+ 
+ * Mon Dec 16 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-5
  - Enabled Python bindings
  
+ * Fri Aug 30 2013 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 0.6.1-4
+ - Documentation installed in an unversioned doc dir
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Wed Jul 10 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-1
  - Update for new upstream release