[gnofract4d: 4/4] Rebuild to ensure F14 has higher NVR than F13.

[Adam Tkac]

commit ba653485e0b39fc1c8abc1c5663d9ec16a8a26b2
Merge: 2d8387f 5bdb58f
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 16:46:28 2010 +0200

    Rebuild to ensure F14 has higher NVR than F13.
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	gnofract4d.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore      |    2 +-
 gnofract4d.spec |   11 +++++++++--
 sources         |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc gnofract4d.spec
index fe34ef6,4303ae6..70cdc30
--- a/gnofract4d.spec
+++ b/gnofract4d.spec
@@@ -89,8 -90,9 +90,14 @@@ update-mime-database %{_datadir}/mime &
  %{python_sitearch}/fractutils/
  
  %changelog
 -* Fri Jun 25 2010 Stewart Adam <s.adam at diffingo.com> - 3.13-1
 -- Update to 3.13
 -- Require gcc (fixes #571970)
++* Fri Aug 20 2010 Adam Tkac <atkac redhat com> - 3.13-1
++- rebuild to ensure F14 has higher NVR than F13
++- following changes have been merged from F13 [Stewart Adam]
++  - Update to 3.13
++  - Require gcc (fixes #571970)
++
 +* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 3.12-4
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
  
  * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.12-3
  - Disable make check, it seems to cause extremely long build times (>24h)