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

pull/3/head
François Andriot 8 years ago
parent 1a3660cb3f
commit a4e38d982a

@ -125,22 +125,6 @@ BuildRequires: pam-devel
# TLS support # TLS support
BuildRequires: gnutls-devel 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 %description
This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: 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 %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 %build
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
@ -183,7 +163,18 @@ make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}"
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%if "%{tde_version}" == "14.1.0"
%__make install DESTDIR="%{?buildroot}" %__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 %clean
@ -193,26 +184,21 @@ export PATH="%{tde_bindir}:${PATH}"
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc gpl.txt %doc gpl.txt
%if "%{tde_version}" == "14.1.0"
%{_bindir}/cardpincheck
%{_bindir}/cryptosmartcard.sh %{_bindir}/cryptosmartcard.sh
%{_datadir}/initramfs-tools/ %{_datadir}/initramfs-tools/
%if "%{tde_version}" == "14.1.0"
%{_bindir}/cardpincheck
%else %else
%dir %{_sysconfdir}/init %{_bindir}/scriptor.pl
%{_sysconfdir}/init/smartauthlogin.conf %{_bindir}/setupcard.sh
%{_sysconfdir}/smartauth/ %{_bindir}/setupslavecard.sh
%{tde_bindir}/cryptosmartcard.sh %{_bindir}/smartauth.sh
%{tde_bindir}/scriptor.pl %{_bindir}/smartauthckpasswd
%{tde_bindir}/setupcard.sh %{_bindir}/smartauthmon
%{tde_bindir}/setupslavecard.sh %{_datadir}/applications/smartcardauth.desktop
%{tde_bindir}/smartauth.sh %{_datadir}/applications/smartcardrestrict.desktop
%{tde_bindir}/smartauthckpasswd %{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
%{tde_bindir}/smartauthmon %{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
%{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/
%endif %endif

Loading…
Cancel
Save