Skip to content

Commit

Permalink
[packaging] Install architecture specific data to libdir. Fixes JB#61015
Browse files Browse the repository at this point in the history
Signed-off-by: Björn Bidar <[email protected]>
  • Loading branch information
Thaodan committed Sep 19, 2023
1 parent 9dd22b4 commit 44c3f04
Show file tree
Hide file tree
Showing 3 changed files with 242 additions and 229 deletions.
20 changes: 10 additions & 10 deletions rpm/macros.qt5-default
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
#

%_qt5_prefix %{_prefix}
%_qt5_bindir %{_prefix}/%{_lib}/qt5/bin
%_qt5_libdir %{_prefix}/%{_lib}
%_qt5_bindir %{_libdir}/qt5/bin
%_qt5_libdir %{_libdir}
%_qt5_archdatadir %{_qt5_libdir}/qt5
%_qt5_libexecdir %{_libexecdir}/qt5
%_qt5_docdir %{_prefix}/share/doc/qt5
%_qt5_headerdir %{_prefix}/include/qt5
%_qt5_includedir %{_includedir}/qt5
%_qt5_datadir %{_prefix}/share/qt5
%_qt5_plugindir %{_prefix}/%{_lib}/qt5/plugins
%_qt5_importdir %{_prefix}/%{_lib}/qt5/imports
%_qt5_translationdir %{_prefix}/share/qt5/translations
%_qt5_translationdir %{_qt5_datadir}/translations
%_qt5_plugindir %{_qt5_archdatadir}/plugins
%_qt5_importdir %{_qt5_archdatadir}/imports
%_qt5_demosdir %{_qt5_archdatadir}/demos
%_qt5_examplesdir %{_qt5_archdatadir}/examples
%_qt5_sysconfdir %{_sysconfdir}/xdg
%_qt5_demosdir %{_prefix}/%{_lib}/qt5/demos
%_qt5_examplesdir %{_prefix}/%{_lib}/qt5/examples


2 changes: 1 addition & 1 deletion rpm/qt.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Paths]
Prefix=/usr
ArchData=share/qt5
ArchData=lib64/qt5
Binaries=lib64/qt5/bin
Data=share/qt5
Documentation=share/doc/qt5
Expand Down
Loading

0 comments on commit 44c3f04

Please sign in to comment.