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

[Dennis Gilmore]

commit b1f2ef699c7f6229b4a82d08ddb254063c746581
Merge: cbffff4 46d568f
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Nov 8 16:44:35 2011 -0600

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

 .gitignore                   |    2 +
 sources                      |    2 +-
 ykpers-1.4.1-bigendian.patch |   11 +++++++
 ykpers-1.4.1-getopt.patch    |   12 ++++++++
 ykpers-1.6.0-bigendian.patch |   11 +++++++
 ykpers-1.6.0-getopt.patch    |   12 ++++++++
 ykpers.spec                  |   60 +++++++++++++++++++++++++++++++++++------
 7 files changed, 100 insertions(+), 10 deletions(-)
---
diff --cc ykpers.spec
index 0ce235a,82db174..296e5f3
--- a/ykpers.spec
+++ b/ykpers.spec
@@@ -7,9 -7,14 +7,16 @@@ Group:          Applications/Syste
  License:        BSD
  URL:            http://code.google.com/p/yubikey-personalization/
  Source0:        http://yubikey-personalization.googlecode.com/files/%{name}-%{version}.tar.gz
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +
+ Patch0:         %{name}-1.6.0-getopt.patch
+ Patch1:         %{name}-1.6.0-bigendian.patch
+ 
+ %ifnarch s390 s390x
+ BuildRequires: libusb1-devel
+ %else
  BuildRequires: libusb-devel
+ %endif
  BuildRequires: libyubikey-devel
  
  %description
@@@ -67,14 -83,32 +85,38 @@@ pw
  %exclude %{_libdir}/libykpers-1.la
  
  %changelog
+ * Thu Jul 21 2011 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.6.0-2
+ - Rebuild for rpm-4.9.1 trailing slash bug
+ 
+ * Thu Jul 21 2011 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.6.0-1
+ - Update to upstream version 1.6.0 (support for firmware 2.3.x, oath changes)
+ - First implementation of udev rules for ykpers
+ 
+ * Fri Apr 29 2011 - Dan Horák <dan[at]danny.cz> - 1.4.1-2
+ - fix build on big endians and with default unsigned char (like s390(x))
+ 
+ * Tue Feb 6 2011 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.4.1-1
+ - Add support for new features in YubiKey 2.2.
+ - Stricter argument parsing, to help user avoid configuration surprises.
+ - Ask kernel to detach USB HID driver with libusb 0.1 too.
+ - Properly reject keys (-a) with upper case hex, instead of just ignoring
+   those bits.
+ - Really check Yubikey compatibility when setting options.
+ - Pretty-printer did not handle bit overloaded cfgflags.
+   It is better now, but not perfect.
+ - Fixes to make it work under Windows.
+ 
+ * Mon Oct 18 2010 - Dan Horák <dan[at]danny.cz> - 1.3.4-2
+ - build with libusb on s390(x)
+ 
 -* Wed Oct 13 2010 - Maxim Burgerhout <maxim at wzzrd.com> - 1.3.4-1
 -- Version bump
 +* Tue Nov 02 2010 - Maxim Burgerhout <wzzrd at fedoraproject.org> - 1.3.4-1
 +- Build new upstream release 1.3.4 for el5 
 +
 +* Wed Oct 20 2010 - Dan Horák <dan[at]danny.cz> - 1.3.3-3
 +- update the configure option to match the BR
 +
 +* Tue Oct 19 2010 - Dennis Gilmore <dennis at ausil.us> - 1.3.3-2
 +- BR libusb-devel not libusb1-devel
  
  * Thu May 27 2010 - Maxim Burgerhout <maxim at wzzrd.com> - 1.3.3-1
  - Version bump