[libyubikey/el5: 17/17] Merge branch 'el6' into el5

[Maxim Burgerhout]

commit 2817ecb6e16b190bee34b3587eff4ffe17481da5
Merge: 60f70e0 2f11de4
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Thu Nov 28 16:43:46 2013 +0100

    Merge branch 'el6' into el5
    
    Had to fix some conflicts, because of the buildroot tag in the el5 spec.

 .gitignore      |    1 +
 libyubikey.spec |   17 +++++++++++++----
 sources         |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --cc libyubikey.spec
index 5a83e6b,1e15664..1229fc4
--- a/libyubikey.spec
+++ b/libyubikey.spec
@@@ -5,9 -5,9 +5,9 @@@ Summary:        C library for decryptin
  
  Group:          Development/Libraries
  License:        BSD
- URL:            http://code.google.com/p/yubico-c/
- Source0:        http://yubico-c.googlecode.com/files/%{name}-%{version}.tar.gz 
+ URL:            http://opensource.yubico.com/yubico-c
+ Source0:        http://opensource.yubico.com/yubico-c/releases/%{name}-%{version}.tar.gz
 -BuildRoot:      %{mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX}
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
  This package holds a low-level C software development kit for the Yubico