Merge branch 'master' into el5

Conflicts:
	.gitignore

.gitignore

@@ -1,7 +1,3 @@
 ykclient-2.3.tar.gz
 /ykclient-2.6.tar.gz
 /ykclient-2.7.tar.gz
-/ykclient-2.12.tar.gz
-/ykclient-2.13.tar.gz
-/ykclient-2.14.tar.gz
-/ykclient-2.15.tar.gz

sources

@@ -1 +1 @@
-d7da4d4acc1461af06346e194aa4960b  ykclient-2.15.tar.gz
+ffaf492498d8d57e87fbbe355d438a91  ykclient-2.7.tar.gz

ykclient.spec

@@ -1,16 +1,15 @@
 Name:           ykclient
-Version:        2.15
-Release:        24%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Summary:        Yubikey management library and client
 
-# Automatically converted from old format: BSD - review is highly recommended.
-License:        LicenseRef-Callaway-BSD
-URL:            http://opensource.yubico.com/yubico-c-client/
-Source0:	http://opensource.yubico.com/yubico-c-client/releases/ykclient-%{version}.tar.gz
+Group:          Applications/System
+License:        BSD
+URL:            http://yubico-c-client.googlecode.com/
+Source0:        http://yubico-c-client.googlecode.com/files/ykclient-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: make
-BuildRequires:  gcc
-BuildRequires:  curl-devel, chrpath, help2man
+BuildRequires:  curl-devel, chrpath
 
 %description
 commandline for yubikeys
@@ -18,7 +17,8 @@ commandline for yubikeys
 %package devel
 
 Summary:  Development headers and libraries for ykclient
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Group:    Development/System
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 development files for ykclient  needed to build applications to
@@ -29,126 +29,34 @@ take advantage of yubikey authentication.
 
 %build
 %configure --enable-static=no
-%make_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libykclient.la
 chrpath -d $RPM_BUILD_ROOT%{_bindir}/ykclient
 
-%ldconfig_scriptlets
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
-%license COPYING
-%doc AUTHORS NEWS README
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS NEWS README
 %{_bindir}/ykclient
 %{_libdir}/libykclient.so.3*
-%{_mandir}/man1/ykclient.1.gz
 
 %files devel
+%defattr(-,root,root,-)
+%doc README COPYING NEWS AUTHORS
 %{_includedir}/*.h
 %{_libdir}/libykclient.so
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 2.15-20
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Aug 1 2019 Orion Poplawski <orion@nwra.com> - 2.15-9
-- Modernize spec
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue May 03 2016 Nick Bebout <nb@fedoraproject.org> - 2.15-1
-- Update to 2.15
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jun 18 2015 Nick Bebout <nb@fedoraproject.org> - 2.14-1
-- Update to 2.14
-
-* Wed Nov 26 2014 Nick Bebout <nb@fedoraproject.org> - 2.13-1
-- Update to 2.13
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Mar 13 2014 Nick Bebout <nb@fedoraproject.org> - 2.12-1
-- Update to 2.12
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
 * Wed Feb 8 2012 Nick Bebout <nb@fedoraproject.org> - 2.7-1
 - Update to 2.7