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

[Adam Tkac]

commit 4477e7d439daa66e5b6fed2bb44ce1a603b94fd2
Merge: 4869f7e e814f92
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 16:38:47 2010 +0200

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

 .gitignore                         |    2 +-
 fwbackups-1.43.3rc4-stdoutfd.patch |   21 ---------------------
 fwbackups.spec                     |   15 +++++++++------
 sources                            |    2 +-
 4 files changed, 11 insertions(+), 29 deletions(-)
---
diff --cc fwbackups.spec
index 5edd83b,7a7b149..56749ce
--- a/fwbackups.spec
+++ b/fwbackups.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:              fwbackups
  Version:           1.43.3
- Release:           0.9.rc4%{?dist}
 -Release:           0.9.rc5%{?dist}
++Release:           0.10.rc5%{?dist}
  Summary:           A feature-rich user backup program
  Group:             Applications/Archiving
  License:           GPLv2+
@@@ -70,8 -67,9 +67,14 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/%{name}/
  
  %changelog
 -* Thu Jul 1 2010 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.9.rc5
 -- Update to 1.43.3rc5 (fixes #579143, #579145, #579146, #579149, #579150,
 -  #579151, #579156, #604682)
++* Fri Aug 20 2010 Adam Tkac <atkac redhat com> - 1.43.3-0.10.rc5
++- rebuild to ensure F14 has higher NVR than F13
++- merge following change from F13 [Stewart Adam]
++  - Update to 1.43.3rc5 (fixes #579143, #579145, #579146, #579149, #579150,
++    #579151, #579156, #604682)
++
 +* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.43.3-0.9.rc4
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
  
  * Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.8.rc4
  - Add patch to fix stdoufd bug during backups