diff options
author | François Andriot <albator78@libertysurf.fr> | 2019-11-06 18:26:52 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2019-11-19 15:07:23 +0100 |
commit | 26d469b405d902b6ba50ae7bf45b940cc6c9d57e (patch) | |
tree | 98f77ad82828b693bae8146af48718a9e684e400 /redhat/applications/smartcardauth | |
parent | 4ec2dd7262a31709881d0417b2519113a7bed1c6 (diff) | |
download | tde-packaging-26d469b405d902b6ba50ae7bf45b940cc6c9d57e.tar.gz tde-packaging-26d469b405d902b6ba50ae7bf45b940cc6c9d57e.zip |
RPM: various fixes to build on OBS
Diffstat (limited to 'redhat/applications/smartcardauth')
-rw-r--r-- | redhat/applications/smartcardauth/smartcardauth.spec | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 072d5b6c7..1cb4a1be3 100644 --- a/redhat/applications/smartcardauth/smartcardauth.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity %endif # PCSC support -%if 0%{?mgaversion} || 0%{?mdkversion} || 9%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: perl-pcsc-perl %endif %if 0%{?rhel} || 0%{?fedora} @@ -167,10 +167,6 @@ in addition to the PKCS certificate functionality unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if [ -x "%{_libdir}/nss/unsupported-tools/pp" ]; then - PATH="%{_libdir}/nss/unsupported-tools:${PATH}" -fi - if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -194,6 +190,9 @@ fi %if 0%{?mgaversion} == 6 || 0%{?pclinuxos} -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \ %endif +%if 0%{?suse_version} + -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \ +%endif \ -DBUILD_ALL=ON \ -DBUILD_DOC=ON \ @@ -209,6 +208,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR="%{?buildroot}" -C build +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file smartcardauth System Security +%suse_update_desktop_file smartcardrestrict System Security +%endif + %clean %__rm -rf %{buildroot} @@ -230,6 +235,7 @@ export PATH="%{tde_bindir}:${PATH}" %{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png %{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png %{_sysconfdir}/smartauth/ +%dir %{_sysconfdir}/init %{_sysconfdir}/init/smartauthlogin.conf |