[sks/el6: 13/13] Merge branch 'master' into el6

[Nick Bebout]

commit 655105b211f15f1354d315b4042de81eaa2321ef
Merge: 70204b7 bb5198d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 13 18:10:16 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sks-1.1.1-libdb.patch
    	sks.spec
    	sources

 .gitignore |    2 +-
 sks.spec   |   28 +++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 64c74a9,e5a369e..2590dfb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--sks-1.1.1.tgz
+ /sks-1.1.2.tgz
diff --cc sks.spec
index dca6087,86985be..e8773b9
--- a/sks.spec
+++ b/sks.spec
@@@ -43,11 -46,23 +46,26 @@@ chrpath --delete %{buildroot}%{_bindir}
  %{_mandir}/man8/sks.8.gz
  
  %changelog
+ * Tue Dec 13 2011 Nick Bebout <nb at fedoraproject.org> - 1.1.2-1
+ - Upgrade to 1.1.2
+ 
+ * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-7
+ - Rebuilt for glibc bug#747377
+ 
+ * Fri Apr 29 2011 Dan Horák <dan[at]danny.cz> - 1.1.1-6
+ - updated the supported arch list
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue May 18 2010 Nick Bebout <nb at fedoraproject.org> - 1.1.1-4
  - Make bdb patch better
++
  * Tue Apr 20 2010 Nick Bebout <nb at fedoraproject.org> - 1.1.1-3
  - Fix FTBFS
++
  * Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
  - Add CFLAGS to make all
++
  * Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
  - Initial Fedora package based on 1.1.1 of sks