[pam_yubico/el5/master: 7/7] Merge branch 'master' into el5

[Dennis Gilmore]

commit 3784617a0f3932c149549998e1ca42630fa8ed52
Merge: 02cadee 01a0690
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Sep 3 16:47:02 2010 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	pam_yubico.spec
    	sources

 pam_yubico.spec |   28 ++++++++++++++++++++++++++++
 sources         |    4 ++++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --cc pam_yubico.spec
index 15294d8,e5f3a0b..0b36d50
--- a/pam_yubico.spec
+++ b/pam_yubico.spec
@@@ -1,13 -1,12 +1,22 @@@
  Name:           pam_yubico
++<<<<<<< HEAD
 +Version:        2.1
 +Release:        2%{?dist}
++=======
+ Version:        2.3
+ Release:        1%{?dist}
++>>>>>>> master
  Summary:        A Pluggable Authentication Module for yubikeys
  
  Group:          System Environment/Base
  License:        BSD
  URL:            http://yubico-pam.googlecode.com/
++<<<<<<< HEAD
 +Source0:        http://yubico-pam.googlecode.com/files/pam_yubico-2.1.tar.gz
 +Patch0:         64bit_pam.patch
++=======
+ Source0:        http://yubico-pam.googlecode.com/files/pam_yubico-%{version}.tar.gz
++>>>>>>> master
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  ykclient-devel pam-devel
@@@ -19,15 -18,12 +28,21 @@@ Linux-PAM and yubikeys. This module sup
  
  %prep
  %setup -q
++<<<<<<< HEAD
 +%patch0 -p0
 +
++=======
++>>>>>>> master
  
  %build
  %configure --libdir=/%{_lib} \
             --with-pam-dir=/%{_lib}/security/
  make %{?_smp_mflags}
  
++<<<<<<< HEAD
 +
++=======
++>>>>>>> master
  %install
  rm -rf $RPM_BUILD_ROOT
  make install DESTDIR=$RPM_BUILD_ROOT
@@@ -35,15 -31,18 +50,28 @@@ rm $RPM_BUILD_ROOT/%{_lib}/security/pam
  %clean
  rm -rf $RPM_BUILD_ROOT
  
++<<<<<<< HEAD
 +
++=======
++>>>>>>> master
  %files
  %defattr(-,root,root,-)
  %doc NEWS README COPYING ChangeLog
  /%{_lib}/security/pam_yubico.so
  
++<<<<<<< HEAD
 +
 +
 +%changelog
++=======
+ %changelog
+ * Fri Sep 03 2010 Dennis Gilmore <dennis at ausil.us> - 2.3-1
+ - update to 2.3
+ 
+ * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+ 
++>>>>>>> master
  * Fri May  8 2009 Mike McGrath <mmcgrath at redhat.com> - 2.1-2
  - Added patch to prevent segfaults in x86_64
  
diff --cc sources
index 29cf2fb,716a269..132fcc6
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ea288fa829790892170887ab4bb779bc  pam_yubico-2.1.tar.gz
++=======
+ f6f0d8d72cc11cd54fb79a37ed76c868  pam_yubico-2.3.tar.gz
++>>>>>>> master