[mingw-p11-kit: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw-p11-kit

[mooninite]

commit 2f21fed9ec9b082b0a676ce67a958f8f41243b02
Merge: b55bada f9f5405
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Sun Aug 5 18:16:09 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw-p11-kit
    
    Conflicts:
    	mingw-p11-kit.spec

 mingw-p11-kit.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc mingw-p11-kit.spec
index 21d05b7,9014b52..66e5716
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@@ -41,8 -41,8 +41,8 @@@ BuildRequires:  gtk-do
  
  
  %description
--p11-kit provides a way to load and enumerate PKCS#11 modules, as well as 
--a standard configuration setup for installing PKCS#11 modules in such a 
++p11-kit provides a way to load and enumerate PKCS#11 modules, as well as
++a standard configuration setup for installing PKCS#11 modules in such a
  way that they're discoverable.  This library is cross-compiled for MinGW.
  
  
@@@ -51,8 -51,8 +51,8 @@@ Summary:        MinGW Library for loadi
  Requires:       pkgconfig
  
  %description -n mingw32-p11-kit
--p11-kit provides a way to load and enumerate PKCS#11 modules, as well as 
--a standard configuration setup for installing PKCS#11 modules in such a 
++p11-kit provides a way to load and enumerate PKCS#11 modules, as well as
++a standard configuration setup for installing PKCS#11 modules in such a
  way that they're discoverable.  This library is cross-compiled for MinGW.
  
  %package -n mingw64-p11-kit
@@@ -111,9 -111,9 +111,12 @@@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir
  
  
  %changelog
 +* Sun Aug 05 2012 Michael Cronenworth <mike at cchtml.com> - 0.13-1
 +- New upstream release.
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Thu Mar 29 2012 Michael Cronenworth <mike at cchtml.com> - 0.12-1
  - New upstream release.