Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own

epel8
Dan Vrátil 11 years ago
parent ef44cf9a1f
commit 9c34be0e42

@ -1,6 +1,6 @@
Name: kf5 Name: kf5
Version: 4.99.0 Version: 4.99.0
Release: 5 Release: 6
Summary: Filesystem and RPM macros for KDE Frameworks 5 Summary: Filesystem and RPM macros for KDE Frameworks 5
BuildArch: noarch BuildArch: noarch
License: BSD License: BSD
@ -43,8 +43,11 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d
%changelog %changelog
* Wed Jun 04 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-6
- Remove kf5 suffix from -DPLUGIN_INSTALL_DIR as packages now specify that on their own
* Wed Jun 04 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-5 * Wed Jun 04 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-5
- Point LIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path - Point -DLIBEXEC_INSTALL_DIR to %%{_libexecdir} to fix duplicated path
* Wed May 14 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-4 * Wed May 14 2014 Daniel Vrátil <dvratil@redhat.com> 4.99.0-4
- Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake - Make LIB_INSTALL_DIR relative, otherwise /usr/usr/lib64/... is generated by CMake

@ -33,7 +33,7 @@
%{?_cmake_lib_suffix64} \\\ %{?_cmake_lib_suffix64} \\\
%endif \ %endif \
-DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\ -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\
-DPLUGIN_INSTALL_DIR:PATH=%{_kf5_plugindir} \\\ -DPLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\
-DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\ -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\
-DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\ -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\
-DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\ -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\

Loading…
Cancel
Save