[dmlite/epel7: 14/14] Merge branch 'el6' into epel7

[Alejandro Alvarez]

commit b4518014481c57322ff19b9ab51dc7a590c97b82
Merge: 956fab3 a5f711b
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Mar 14 14:44:01 2014 +0100

    Merge branch 'el6' into epel7
    
    Conflicts:
    	.gitignore
    	dmlite.spec
    	sources

 .gitignore  |    1 +
 dmlite.spec |   48 +++++++++++++++++++++++++++++++++++++++++-------
 sources     |    2 +-
 3 files changed, 43 insertions(+), 8 deletions(-)
---
diff --cc dmlite.spec
index 7a770ec,fca8361..4e60bfa
--- a/dmlite.spec
+++ b/dmlite.spec
@@@ -7,11 -16,12 +16,11 @@@ License:	ASL 2.
  URL:		https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm/Dev/Dmlite
  # The source of this package was pulled from upstream's vcs. Use the
  # following commands to generate the tarball:
- # svn export http://svn.cern.ch/guest/lcgdm/dmlite/tags/dmlite_0_6_0 dmlite-0.6.0
- # tar -czvf dmlite-0.6.0.tar.gz dmlite-0.6.0
+ # svn export http://svn.cern.ch/guest/lcgdm/dmlite/tags/dmlite_0_6_2c dmlite-0.6.2
+ # tar -czvf dmlite-0.6.2.tar.gz dmlite-0.6.2
  Source0:	%{name}-%{version}.tar.gz
  # We currently don't package tests in fedora 
 -Patch0:         dmlite-disable-tests.patch
 -
 +Patch0:		dmlite-disable-tests.patch
  Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
@@@ -66,11 -77,11 +76,11 @@@ This package provides a python wrapper 
  
  %prep
  %setup -q -n %{name}-%{version}
 -%patch0 -p1
  
 +%patch0 -p1
  
  %build
- %cmake . -DCMAKE_INSTALL_PREFIX=/ -DBUILD_PYTHON=ON
 -%cmake . -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON
++%cmake . -DCMAKE_INSTALL_PREFIX=/ -DBUILD_PYTHON=ON -DRUN_ONLY_STANDALONE_TESTS=ON
  
  make %{?_smp_mflags}
  
@@@ -105,16 -128,33 +127,28 @@@ 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
  
 +%files -n python-dmlite
 +%defattr(-,root,root,-)
 +%{python_sitearch}/pydmlite.so
 +
  %changelog
 -* Tue Mar 11 2014 Adrien Devresse <adevress at cern.ch> - 0.6.2-1 
++* 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
 +* Mon Dec 16 2013 Alejandro Alvarez <aalvarez at cern.ch> - 0.6.1-2
  - 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