diff --git a/.gitignore b/.gitignore index 8525091..c57bf6b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libnfc-1.3.4.tar.gz /libnfc-1.4.0.tar.gz /libnfc-1.4.1.tar.gz /libnfc-1.4.2.tar.gz +/libnfc-1.7.0-rc6.tar.gz diff --git a/libnfc.spec b/libnfc.spec index edf7e30..2dc4e4a 100644 --- a/libnfc.spec +++ b/libnfc.spec @@ -1,13 +1,12 @@ Name: libnfc -Version: 1.4.2 -Release: 6%{?dist} +Version: 1.7.0 +Release: 0.1.rc6%{?dist} Summary: NFC SDK and Programmers API Group: System Environment/Libraries License: LGPLv3+ URL: http://www.libnfc.org/ -Source0: http://libnfc.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: libnfc_usb_enumeration.patch +Source0: http://libnfc.googlecode.com/files/%{name}-%{version}-rc6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel @@ -38,11 +37,11 @@ The libnfc-examples package contains examples demonstrating the functionality of libnfc. %prep -%setup -q -%patch0 -p1 +%setup -qn %{name}-%{version}-rc6 %build -%configure --disable-static +%configure --disable-static --with-drivers=all + # remove rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -81,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed Mar 20 2013 F. Kooman - 1.7.0-0.1.rc6 +- update to 1.7.0-rc6 +- remove upstreamed usb enumeration patch +- explicitly enable all drivers + * Thu Feb 14 2013 Fedora Release Engineering - 1.4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/libnfc_usb_enumeration.patch b/libnfc_usb_enumeration.patch deleted file mode 100644 index eefc490..0000000 --- a/libnfc_usb_enumeration.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN libnfc-1.4.2.orig/libnfc/drivers/acr122.c libnfc-1.4.2/libnfc/drivers/acr122.c ---- libnfc-1.4.2.orig/libnfc/drivers/acr122.c 2011-02-22 15:21:49.000000000 +0100 -+++ libnfc-1.4.2/libnfc/drivers/acr122.c 2012-07-30 14:47:55.065969148 +0200 -@@ -74,6 +74,7 @@ - "ACS ACR 38U-CCID", // Touchatag, early version - "ACS ACR38U-CCID", // Touchatag, early version, under MacOSX - " CCID USB", // ?? -+ "ACS AET65 00 00", - NULL - }; - diff --git a/sources b/sources index a2965aa..f11faff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c99b2b9212b1a1b064055a199779bdd8 libnfc-1.4.2.tar.gz +6883578acc55440fe16cd78318167f22 libnfc-1.7.0-rc6.tar.gz