[glpi-mass-ocs-import/el6] (7 commits) ...fix merge

[Remi Collet]

Summary of changes:

  159e296... Fix typo that causes a failure to update the common directo (*)
  4d2a7ff... spec cleanup (*)
  b3a33ff... dist-git conversion (*)
  a7d662f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  dae4e68... update to 1.4.2 for GLPI 0.78 (*)
  95f0b1d... version 1.5.2 for GLPI 0.80 (*)
  1efd749... fix merge

(*) This commit already existed in another branch; no separate mail sent