From 52126b26947228be53d764ea82fa40aa70e57f52 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Sep 25 2020 18:40:14 +0000 Subject: Reorder commands in %%install section --- diff --git a/AusweisApp2.spec b/AusweisApp2.spec index 3e50e42..3f4d4d0 100644 --- a/AusweisApp2.spec +++ b/AusweisApp2.spec @@ -214,12 +214,19 @@ EOF %install %cmake_install -# Move installed files to proper locations. -mkdir -p %{buildroot}%{_qt5_translationdir} +# Relocate the application binary so we can call it through +# a shell wrapper and move installed files to proper locations. +mkdir -p %{buildroot}{%{_libexecdir},%{_qt5_translationdir}} +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name} mv %{buildroot}%{_datadir}/%{name}/translations/* \ %{buildroot}%{_qt5_translationdir} rm -fr %{buildroot}%{_datadir}/%{name}/translations +# Install the shell wrapper and custom OpenSSL configuration. +install -pm 0755 fedora_%{name}_wrapper.sh %{buildroot}%{_bindir}/%{name} +install -pm 0644 fedora_%{name}_openssl.cnf \ + %{buildroot}%{_datadir}/%{name}/openssl.cnf + # Generate man-page. mkdir -p %{buildroot}%{_mandir}/man1 help2man \ @@ -228,16 +235,7 @@ help2man \ --help-option="--platform offscreen --help-all" \ --version-option="--platform offscreen --version" \ --output=%{buildroot}%{_mandir}/man1/%{name}.1 \ - %{buildroot}%{_bindir}/%{name} - -# Relocate the application binary so we can call it through a shell wrapper. -mkdir -p %{buildroot}%{_libexecdir} -mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_libexecdir}/%{name} - -# Install the shell wrapper and custom OpenSSL configuration. -install -pm 0755 fedora_%{name}_wrapper.sh %{buildroot}%{_bindir}/%{name} -install -pm 0644 fedora_%{name}_openssl.cnf \ - %{buildroot}%{_datadir}/%{name}/openssl.cnf + %{buildroot}%{_libexecdir}/%{name} # Excessive docs. mkdir -p %{buildroot}%{_pkgdocdir}/{installation,integration,notes,sdk}