[pkcs11-helper/el5: 24/24] Merge branch 'el6' into el5

[Jon Ciesla]

commit 2f815d0fb76c602df139fceb4511f1c5aab0e806
Merge: 51b63d4 d5d3175
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 2 12:51:20 2014 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    	pkcs11-helper.spec
    	sources

 pkcs11-helper.spec |   55 +++++++++++++++++++++++++++++++++++++++++++++------
 sources            |    2 +-
 2 files changed, 49 insertions(+), 8 deletions(-)
---
diff --cc pkcs11-helper.spec
index c3104bb,84dcfe0..c1025a3
--- a/pkcs11-helper.spec
+++ b/pkcs11-helper.spec
@@@ -1,13 -1,12 +1,13 @@@
  Name:           pkcs11-helper
- Version:        1.07
- Release:        2%{?dist}.1
+ Version:        1.11
+ Release:        3%{?dist}
  Summary:        A library for using PKCS#11 providers
  
- Group:          Development/Libraries
+ Group:          System Environment/Libraries
  License:        GPLv2 or BSD
- URL:            http://www.opensc-project.org/pkcs11-helper/
- Source0:        http://www.opensc-project.org/files/%{name}/%{name}-%{version}.tar.bz2
+ URL:            http://www.opensc-project.org/opensc/wiki/pkcs11-helper
+ Source0:        http://downloads.sourceforge.net/opensc/pkcs11-helper-%{version}.tar.bz2
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  doxygen graphviz
  BuildRequires:  openssl-devel