From 14aa9dd4948db58c958c37ec93648d0e757b1610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 27 Jun 2015 13:54:07 +0200
Subject: RPM packaging: update smartcardauth, trinity-filesystem

---
 redhat/applications/smartcardauth/smartcardauth-14.0.0.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'redhat/applications/smartcardauth')

diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index 4176d716d..75d7e35b6 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -53,6 +53,8 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-%{tde_pkg}-rpmlintrc
+Patch0:			%{tde_pkg}-%{tde_version}.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -135,6 +137,7 @@ in addition to the PKCS certificate functionality
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
 
 %__sed -i "Makefile" \
 	-e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
@@ -143,10 +146,8 @@ in addition to the PKCS certificate functionality
 %build
 export PATH="%{tde_bindir}:${PATH}"
 
-export CFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}"
-export CXXFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}"
-
-./build_ckpasswd
+cd src
+make CFLAGS="${RPM_OPT_FLAGS}"  CXXFLAGS="${RPM_OPT_FLAGS}"
 
 
 %install
-- 
cgit v1.2.1