[libnfc] fix patch

François Kooman fkooman at fedoraproject.org
Mon Jul 30 12:51:01 UTC 2012


commit 667f42f42fe34fe03b68aaa58a5eefae69fde510
Author: François Kooman <fkooman at tuxed.net>
Date:   Mon Jul 30 14:50:55 2012 +0200

    fix patch

 libnfc.spec                  |    7 +++++--
 libnfc_usb_enumeration.patch |   23 +++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/libnfc.spec b/libnfc.spec
index 2e79d45..f514899 100644
--- a/libnfc.spec
+++ b/libnfc.spec
@@ -1,6 +1,6 @@
 Name:           libnfc
 Version:        1.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NFC SDK and Programmers API
 
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@ of libnfc.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 30 2012 F. Kooman <fkooman at tuxed.net> - 1.4.2-5
+- fix patch
+
 * Mon Jul 30 2012 F. Kooman <fkooman at tuxed.net> - 1.4.2-4
 - added usb enumeration patch to fix RHBZ #832983, #843660
 
diff --git a/libnfc_usb_enumeration.patch b/libnfc_usb_enumeration.patch
index 5e6a06f..eefc490 100644
--- a/libnfc_usb_enumeration.patch
+++ b/libnfc_usb_enumeration.patch
@@ -1,12 +1,11 @@
-*** acr122b.c	2012-07-27 00:37:17.903267685 +0200
---- acr122.c	2012-07-27 00:40:03.386123096 +0200
-***************
-*** 74,79 ****
---- 74,80 ----
-    "ACS ACR 38U-CCID",   // Touchatag, early version
-    "ACS ACR38U-CCID",    // Touchatag, early version, under MacOSX
-    "    CCID USB",       // ??
-+   "ACS AET65 00 00",
-    NULL
-  };
-  
+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
+ };
+ 


More information about the scm-commits mailing list