[lcgdm: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/lcgdm

[Alejandro Alvarez]

commit 24220e54b4aa86bd21baef369f733f18ff9e1d0c
Merge: fcc7c7b 9705f9d
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Aug 30 15:49:58 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/lcgdm
    
    Conflicts:
    	lcgdm.spec

 lcgdm.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc lcgdm.spec
index 3741ad1,546e761..2877297
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@@ -36,7 -36,7 +36,7 @@@
  
  Name:		lcgdm
  Version:	1.8.7
- Release:	4%{?dist}
 -Release:	5%{?dist}
++Release:	6%{?dist}
  Summary:	LHC Computing Grid Data Management
  
  Group:		Applications/Internet
@@@ -1618,9 -1631,12 +1618,15 @@@ f
  %doc %{_mandir}/man8/rfiod.8*
  
  %changelog
- * Fri Aug 30 2013 Alejandro Alvarez <aalvarez at cern.ch> 1.8.7-4
++* Fri Aug 30 2013 Alejandro Alvarez <aalvarez at cern.ch> 1.8.7-6
 +- Introduce systemd-rpm macros
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.7-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Jul 18 2013 Petr Pisar <ppisar at redhat.com> - 1.8.7-4
+ - Perl 5.18 rebuild
+ 
  * Wed Jul 10 2013 Alejandro Alvarez <aalvarez at cern.ch> 1.8.7-3
  - Update for new upstream release
  - Fixed bogus dates