- add missing include unistd.h

- build with system getopt
- rel 2

diff --git a/getopt.patch b/getopt.patch
new file mode 100644 (file)
index 0000000..50a34cb
--- /dev/null
+++ b/getopt.patch
@@ -0,0 +1,22 @@
+--- smartcardpp-0.3.0/test.cpp~        2011-10-12 20:24:16.000000000 +0200
++++ smartcardpp-0.3.0/test.cpp 2014-01-22 20:24:59.232357507 +0100
+@@ -14,7 +14,7 @@
+ #include <string>
+ #include <stdlib.h>
+ #include "smartcardpp.h"
+-#include "compat_getopt.h"
++#include <getopt.h>
+ #include "compat_getpass.h"
+ 
+ void validateOnPinpad();
+--- smartcardpp-0.3.0/CMakeLists.txt~  2011-10-12 20:24:16.000000000 +0200
++++ smartcardpp-0.3.0/CMakeLists.txt   2014-01-22 20:25:16.819024046 +0100
+@@ -92,7 +92,7 @@
+ set_target_properties(smartcardpp PROPERTIES VERSION ${SMARTCARDPP_VERSION} SOVERSION 1)
+ install(TARGETS smartcardpp DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-add_executable(card-test compat_getopt.c compat_getpass.c test.cpp)
++add_executable(card-test compat_getpass.c test.cpp)
+ target_link_libraries(card-test smartcardpp ${CMAKE_DL_LIBS})
+ install(TARGETS card-test DESTINATION ${BIN_INSTALL_DIR})
+ 

diff --git a/sleep.patch b/sleep.patch
new file mode 100644 (file)
index 0000000..115dd24
--- /dev/null
+++ b/sleep.patch
@@ -0,0 +1,10 @@
+--- smartcardpp-0.3.0/CardBase.cpp~    2011-10-12 20:24:16.000000000 +0200
++++ smartcardpp-0.3.0/CardBase.cpp     2014-01-22 20:15:41.235694879 +0100
+@@ -15,6 +15,7 @@
+ #include "CardBase.h"
+ #include <algorithm>
+ #include <time.h>
++#include <unistd.h>
+ #include "helperMacro.h"
+ #ifdef WIN32
+       #include <Windows.h>

diff --git a/smartcardpp.spec b/smartcardpp.spec
index a7356355282af5f54f17841b85f1240197a8301c..cc7ad6cd361976be1b257155e735660045fad13b 100644 (file)
--- a/smartcardpp.spec
+++ b/smartcardpp.spec
@@ -2,12 +2,14 @@ Summary:      Library for accessing smart cards
 Summary(pl.UTF-8):     Biblioteka do dostępu do kart procesorowych
 Name:          smartcardpp
 Version:       0.3.0
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 #Source0Download: http://code.google.com/p/esteid/downloads/list
 Source0:       http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5: c6172387475982393d02314f389f3513
+Patch0:                sleep.patch
+Patch1:                getopt.patch
 URL:           http://code.google.com/p/esteid/
 BuildRequires: cmake >= 2.6
 BuildRequires: libstdc++-devel
@@ -42,6 +44,8 @@ wykorzystujących bibliotekę smartcardpp.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 install -d build