pool/kf5-filesystem
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Use %_libexecdir

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kf5-filesystem?expand=0&rev=81
This commit is contained in:
Luca Beltrame
2022-03-07 21:43:58 +00:00
committed by Git OBS Bridge
parent 499b4ac9e6
commit 20a201a9cc
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kf5-filesystem.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 7 09:53:25 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update the libexec path (boo#1174075)
- Make kf5-filesystem own %{_kf5_plugindir}/kf5
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 16 08:37:57 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr> Fri Oct 16 08:37:57 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

12
kf5-filesystem.spec
View File

@@ -18,7 +18,7 @@
Name: kf5-filesystem Name: kf5-filesystem
URL: https://www.kde.org URL: https://www.kde.org
Version: 20201017 Version: 20220307
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KF5 Directory Layout Summary: KF5 Directory Layout
@@ -41,7 +41,7 @@ This package provides macros which are utilized with extra-cmake-modules' KDEIns
%define _kf5_datadir %{_kf5_sharedir}/kf5 %define _kf5_datadir %{_kf5_sharedir}/kf5
%define _kf5_includedir %{_includedir}/KF5 %define _kf5_includedir %{_includedir}/KF5
%define _kf5_libdir %{_kf5_prefix}/%{_lib} %define _kf5_libdir %{_kf5_prefix}/%{_lib}
%define _kf5_libexecdir %{_kf5_libdir}/libexec/kf5 %define _kf5_libexecdir %{_libexecdir}/kf5
%define _kf5_mandir %{_mandir} %define _kf5_mandir %{_mandir}
%define _kf5_sbindir %{_sbindir} %define _kf5_sbindir %{_sbindir}
%define _kf5_notifydir %{_kf5_sharedir}/knotifications5 %define _kf5_notifydir %{_kf5_sharedir}/knotifications5
@@ -83,12 +83,13 @@ install -D -m755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/fileattrs/localekf5.pro
%endif %endif
mkdir -p %{buildroot}%{_kf5_datadir} mkdir -p %{buildroot}%{_kf5_datadir}
mkdir -p %{buildroot}%{_kf5_importdir}
mkdir -p %{buildroot}%{_kf5_includedir} mkdir -p %{buildroot}%{_kf5_includedir}
mkdir -p %{buildroot}%{_kf5_libexecdir} mkdir -p %{buildroot}%{_kf5_libexecdir}
mkdir -p %{buildroot}%{_kf5_notifydir} mkdir -p %{buildroot}%{_kf5_notifydir}
mkdir -p %{buildroot}%{_kf5_plugindir}
mkdir -p %{buildroot}%{_kf5_plasmadir} mkdir -p %{buildroot}%{_kf5_plasmadir}
mkdir -p %{buildroot}%{_kf5_importdir} mkdir -p %{buildroot}%{_kf5_plugindir}
mkdir -p %{buildroot}%{_kf5_plugindir}/kf5
mkdir -p %{buildroot}%{_kf5_qmldir} mkdir -p %{buildroot}%{_kf5_qmldir}
mkdir -p %{buildroot}%{_kf5_cmakedir} mkdir -p %{buildroot}%{_kf5_cmakedir}
mkdir -p %{buildroot}%{_kf5_mkspecsdir} mkdir -p %{buildroot}%{_kf5_mkspecsdir}
@@ -131,14 +132,13 @@ popd
%endif %endif
%dir %{_kf5_datadir} %dir %{_kf5_datadir}
%dir %{_kf5_includedir} %dir %{_kf5_includedir}
%dir %{_kf5_libdir}/libexec
%dir %{_kf5_libexecdir} %dir %{_kf5_libexecdir}
%dir %{_mandir}/* %dir %{_mandir}/*
%dir %{_mandir}/*/man1 %dir %{_mandir}/*/man1
%dir %{_kf5_notifydir} %dir %{_kf5_notifydir}
%dir %{_kf5_libdir}/qt5 %dir %{_kf5_libdir}/qt5
%dir %{_kf5_libdir}/qt5/plugins
%dir %{_kf5_plugindir} %dir %{_kf5_plugindir}
%dir %{_kf5_plugindir}/kf5
%dir %{_kf5_plasmadir} %dir %{_kf5_plasmadir}
%dir %{_kf5_importdir} %dir %{_kf5_importdir}
%dir %{_kf5_qmldir} %dir %{_kf5_qmldir}

3
macros.kf5
View File

@@ -7,7 +7,7 @@
%_kf5_datadir %{_kf5_sharedir}/kf5 %_kf5_datadir %{_kf5_sharedir}/kf5
%_kf5_includedir %{_includedir}/KF5 %_kf5_includedir %{_includedir}/KF5
%_kf5_libdir %{_kf5_prefix}/%{_lib} %_kf5_libdir %{_kf5_prefix}/%{_lib}
%_kf5_libexecdir %{_kf5_libdir}/libexec/kf5 %_kf5_libexecdir %{_libexecdir}/kf5
%_kf5_mandir %{_kf5_sharedir}/man %_kf5_mandir %{_kf5_sharedir}/man
%_kf5_sbindir %{_sbindir} %_kf5_sbindir %{_sbindir}
%_kf5_notifydir %{_kf5_sharedir}/knotifications5 %_kf5_notifydir %{_kf5_sharedir}/knotifications5
@@ -67,6 +67,7 @@
-DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \\\ -DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \\\
-DCMAKE_PREFIX_PATH=%{_kf5_prefix} \\\ -DCMAKE_PREFIX_PATH=%{_kf5_prefix} \\\
-DKDE_INSTALL_LIBDIR=%{_lib} \\\ -DKDE_INSTALL_LIBDIR=%{_lib} \\\
-DKDE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\
-DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \\\ -DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \\\
-DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \\\ -DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \\\
-DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \\\ -DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \\\