[python-trml2pdf: 3/4] Merge branch 'f18' into f19

[Cristian Ciupitu]

commit c278410f25ecb4f81dbcfc0333e709bdac7b0cbc
Merge: ec9d964 f78c39f
Author: Cristian Ciupitu <cristian.ciupitu at yahoo.com>
Date:   Sun Oct 13 13:56:12 2013 +0300

    Merge branch 'f18' into f19
    
    Conflicts:
    	python-trml2pdf.spec

 python-trml2pdf.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc python-trml2pdf.spec
index d04651a,c300b1d..09a4dd5
--- a/python-trml2pdf.spec
+++ b/python-trml2pdf.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:           python-trml2pdf
  Version:        1.2
--Release:        8%{?dist}
++Release:        9%{?dist}
  Summary:        Tiny RML2PDF is a tool to easily create PDF documents without programming
  
  Group:          Development/Languages
@@@ -50,15 -50,15 +50,18 @@@ ln -s %{python_sitelib}/trml2pdf/trml2p
  
  
  %changelog
 -* Sun Oct 13 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-8
++* Sun Oct 13 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-9
+ - Use macros consistently (thanks Jos de Kloe)
+ 
 -* Thu Oct 10 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-7
 +* Thu Oct 10 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-8
  - Modernize SPEC (thanks Jason Tibbitts)
  
 -* Thu Oct 10 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-6
 +* Thu Oct 10 2013 Cristian Ciupitu <cristian.ciupitu at yahoo.com> - 1.2-7
  - Fix URL for Source1 (thanks Jos de Kloe)
  
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild