From 3e15fa6afbcb903f125b7494fa30c6d83998706b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mar 31 2008 16:14:14 +0000 Subject: - add %%{_kde4_libexecdir}, set LIBEXEC_INSTALL_DIR to it - don't own %%{_kde4_libdir} which is just %%{_libdir} --- diff --git a/kde-filesystem.spec b/kde-filesystem.spec index d31f0d4..c3656e1 100644 --- a/kde-filesystem.spec +++ b/kde-filesystem.spec @@ -1,6 +1,7 @@ %define _kde4_prefix %_prefix %define _kde4_sysconfdir %_sysconfdir %define _kde4_libdir %_libdir +%define _kde4_libexecdir %_libexecdir/kde4 %define _kde4_datadir %_datadir %define _kde4_sharedir %_datadir %define _kde4_iconsdir %_kde4_sharedir/icons @@ -16,7 +17,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 4 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Base License: Public Domain @@ -78,7 +79,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \ -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \ -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \ -p $RPM_BUILD_ROOT%{_kde4_includedir} \ - -p $RPM_BUILD_ROOT%{_kde4_libdir} \ + -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \ -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \ -p $RPM_BUILD_ROOT%{_kde4_appsdir} \ -p $RPM_BUILD_ROOT%{_kde4_appsdir}/color-schemes \ @@ -159,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT %{name}.list # KDE4 %config /etc/rpm/macros.kde4 %{_kde4_sysconfdir}/kde4/ -%{_kde4_libdir}/ +%{_kde4_libexecdir}/ %{_kde4_includedir}/ %{_kde4_datadir}/applications/kde4/ %{_kde4_appsdir}/ @@ -178,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT %{name}.list %changelog +* Mon Mar 31 2008 Kevin Kofler 4-11 +- add %%{_kde4_libexecdir}, set LIBEXEC_INSTALL_DIR to it +- don't own %%{_kde4_libdir} which is just %%{_libdir} + * Mon Mar 31 2008 Rex Dieter 4-10 - macros.kde4: _kde4_buildtype=FEDORA diff --git a/macros.kde4 b/macros.kde4 index ed398da..1027a33 100644 --- a/macros.kde4 +++ b/macros.kde4 @@ -21,4 +21,5 @@ -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\ -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\ -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\ + -DLIBEXEC_INSTALL_DIR=%{_kde4_libexecdir} \\\ -DDATA_INSTALL_DIR=%{_kde4_appsdir}