[bcfg2/f15: 30/30] Merge branch 'el6' into f15

[Fabian Affolter]

commit 56807a1e35ba2a7bfd30da575bd268555ed02d0c
Merge: adcf263 690759b
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Thu Jun 2 15:31:07 2011 +0200

    Merge branch 'el6' into f15
    
    Conflicts:
    	.gitignore
    	bcfg2.spec
    	sources

 .gitignore             |   12 ++----------
 bcfg2-1.1.2.tar.gz.gpg |    7 +++++++
 bcfg2.spec             |   47 ++++++++++++++++-------------------------------
 branch                 |    4 ++++
 sources                |    4 ++--
 5 files changed, 31 insertions(+), 43 deletions(-)
---
diff --cc .gitignore
index 7825bda,c607474..1c3c5d1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,14 +1,2 @@@
- /bcfg2-1.1.0rc4.tar.gz
- /bcfg2-1.1.0rc4.tar.gz.gpg
- /tgenshi-indent.patch
- /YUMng.py
- /bcfg2-1.1.0rc5.tar.gz
- /bcfg2-1.1.0rc5.tar.gz.gpg
- /bcfg2-1.1.0.tar.gz
- /bcfg2-1.1.0.tar.gz.gpg
- /bcfg2-1.1.1.tar.gz
- /bcfg2-1.1.1.tar.gz.gpg
 -<<<<<<< HEAD
 -/bcfg2-1.1.0rc4.tar.gz
 -/bcfg2-1.1.0rc4.tar.gz.gpg
 -/tgenshi-indent.patch
 -/YUMng.py
 -/bcfg2-1.1.0rc5.tar.gz
 -/bcfg2-1.1.0rc5.tar.gz.gpg
 -/bcfg2-1.1.0.tar.gz
 -/bcfg2-1.1.0.tar.gz.gpg
 -=======
 -bcfg2-0.9.6.tar.gz
+ /bcfg2-1.1.2.tar.gz
 ->>>>>>> el5
+ /bcfg2-1.1.2.tar.gz.gpg
diff --cc bcfg2.spec
index 7b5209b,af5b662..c712b8c
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@@ -218,27 -205,11 +206,24 @@@ f
  %dir %{_var}/lib/bcfg2
  
  %changelog
+ * Thu Jun 02 2011 Fabian Affolter <fabian at bernewireless.net> - 1.1.2-1
+ - Updated to new upstream version 1.1.2
+ - Pooled file section entries to reduce future maintenance
+ - Fixed #683239
+ 
 +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2.1
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +
 +* Thu Nov 18 2010 Fabian Affolter <fabian at bernewireless.net> - 1.1.1-2
 +- Added new man page
 +- Updated doc section (ChangeLog is gone)
 +
 +* Thu Nov 18 2010 Fabian Affolter <fabian at bernewireless.net> - 1.1.1-1
 +- Updated to new upstream version 1.1.1
 +
 +* Fri Nov  5 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.0-3
 +- Add patch from Gordon Messmer to fix authentication on F14+ (Python 2.7)
 +
  * Mon Sep 27 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1.0-2
  - Update to final version