RPM packaging: fix smartcardauth r14.0.x destination directory

1 files changed, 23 insertions, 37 deletions

diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
index a4d2fd74f..02673afd1 100644
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec
@@ -125,22 +125,6 @@ BuildRequires:	pam-devel
 # TLS support
 BuildRequires:	gnutls-devel
 
-# PRETTYPRINT utility
-%if "%{?tde_version}" != "14.1.0"
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	nss-tools
-%define pp %{_libdir}/nss/unsupported-tools/pp
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nss
-%define pp /usr/bin/pp
-%endif
-%if 0%{?suse_version}
-BuildRequires:	mozilla-nss-tools
-%define pp /usr/lib/nss/pp
-%endif
-%endif
-
 
 %description
 This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
@@ -168,10 +152,6 @@ in addition to the PKCS certificate functionality
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__sed -i "Makefile" \
-       -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" \
-       -e "s|/usr/bin/pp|%{pp}|"
-
 
 %build
 export PATH="%{tde_bindir}:${PATH}"
@@ -183,7 +163,18 @@ make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
+
+%if "%{tde_version}" == "14.1.0"
 %__make install DESTDIR="%{?buildroot}"
+%else
+%__install -D -m 755 "scriptor_standalone.pl" "%{buildroot}%{_bindir}/scriptor.pl"
+%__install -D -m 755 "src/ckpasswd" "%{buildroot}%{_bindir}/smartauthckpasswd"
+%__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon"
+%__cp -Rp "usr/"*  "%{buildroot}%{_prefix}"
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop"
+%endif
 
 
 %clean
@@ -193,26 +184,21 @@ export PATH="%{tde_bindir}:${PATH}"
 %files
 %defattr(-,root,root,-)
 %doc gpl.txt
-%if "%{tde_version}" == "14.1.0"
-%{_bindir}/cardpincheck
 %{_bindir}/cryptosmartcard.sh
 %{_datadir}/initramfs-tools/
+%if "%{tde_version}" == "14.1.0"
+%{_bindir}/cardpincheck
 %else
-%dir %{_sysconfdir}/init
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/
+%{_bindir}/scriptor.pl
+%{_bindir}/setupcard.sh
+%{_bindir}/setupslavecard.sh
+%{_bindir}/smartauth.sh
+%{_bindir}/smartauthckpasswd
+%{_bindir}/smartauthmon
+%{_datadir}/applications/smartcardauth.desktop
+%{_datadir}/applications/smartcardrestrict.desktop
+%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
+%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
 %endif