[packages/kf6-kconfig] - files cleanup, added missing Qml dependency
qboosh
qboosh at pld-linux.org
Sat May 31 20:16:34 CEST 2025
commit 9983744619cc6808dbaf64c263bc52eb3f92a90c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 31 20:03:02 2025 +0200
- files cleanup, added missing Qml dependency
kf6-kconfig.spec | 56 +++++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 27 deletions(-)
---
diff --git a/kf6-kconfig.spec b/kf6-kconfig.spec
index 4bee7bd..7b70e4e 100644
--- a/kf6-kconfig.spec
+++ b/kf6-kconfig.spec
@@ -1,8 +1,9 @@
#
# Conditional build:
-%bcond_with tests # build with tests
+%bcond_with tests # test suite
+
%define kdeframever 6.14
-%define qtver 5.15.2
+%define qt_ver 5.15.2
%define kfname kconfig
Summary: Backend for storing application configuration
@@ -13,28 +14,28 @@ License: LGPL v2.1+
Group: X11/Libraries
Source0: https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
# Source0-md5: 84762f48c328e4e34fc4b0765829e9c7
-URL: http://www.kde.org/
-BuildRequires: Qt6Core-devel >= %{qtver}
-BuildRequires: Qt6DBus-devel >= %{qtver}
-BuildRequires: Qt6Gui-devel >= %{qtver}
-BuildRequires: Qt6Test-devel >= %{qtver}
-BuildRequires: Qt6Xml-devel >= %{qtver}
+URL: https://kde.org/
+BuildRequires: Qt6Core-devel >= %{qt_ver}
+BuildRequires: Qt6DBus-devel >= %{qt_ver}
+BuildRequires: Qt6Gui-devel >= %{qt_ver}
+BuildRequires: Qt6Qml-devel >= %{qt_ver}
+BuildRequires: Qt6Test-devel >= %{qt_ver}
+BuildRequires: Qt6Xml-devel >= %{qt_ver}
BuildRequires: cmake >= 3.16
BuildRequires: kf6-extra-cmake-modules >= %{kdeframever}
BuildRequires: ninja
-BuildRequires: qt6-linguist >= %{qtver}
+BuildRequires: qt6-linguist >= %{qt_ver}
BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: tar >= 1:1.22
BuildRequires: xz
-Requires: Qt6DBus >= %{qtver}
-Requires: Qt6Gui >= %{qtver}
-Requires: Qt6Xml >= %{qtver}
+Requires: Qt6DBus >= %{qt_ver}
+Requires: Qt6Gui >= %{qt_ver}
+Requires: Qt6Qml >= %{qt_ver}
+Requires: Qt6Xml >= %{qt_ver}
Requires: kf6-dirs
#Obsoletes: kf5-%{kfname} < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define qt6dir %{_libdir}/qt6
-
%description
KConfig provides an advanced configuration system. It is made of two
parts: KConfigCore and KConfigGui.
@@ -63,6 +64,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe dla programistów używających %{kfname}
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: Qt6DBus-devel >= %{qtver}
+Requires: Qt6Qml-devel >= %{qtver}
Requires: Qt6Xml-devel >= %{qtver}
Requires: cmake >= 3.16
#Obsoletes: kf5-%{kfname}-devel < %{version}
@@ -88,10 +90,10 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
%ninja_build -C build test
%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/kconf_update
+
%ninja_install -C build
%find_lang %{kfname}5_qt --with-qm --all-name --with-kde
@@ -99,38 +101,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/kconf_update
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -f %{kfname}5_qt.lang
%defattr(644,root,root,755)
%doc DESIGN README.md TODO
-%ghost %{_libdir}/libKF6ConfigCore.so.6
+%attr(755,root,root) %{_bindir}/kreadconfig6
+%attr(755,root,root) %{_bindir}/kwriteconfig6
+%attr(755,root,root) %{_libexecdir}/kf6/kconf_update
+%attr(755,root,root) %{_libexecdir}/kf6/kconfig_compiler_kf6
%attr(755,root,root) %{_libdir}/libKF6ConfigCore.so.*.*
+%ghost %{_libdir}/libKF6ConfigCore.so.6
+%attr(755,root,root) %{_libdir}/libKF6ConfigGui.so.*.*
%ghost %{_libdir}/libKF6ConfigGui.so.6
+%attr(755,root,root) %{_libdir}/libKF6ConfigQml.so.*.*
%ghost %{_libdir}/libKF6ConfigQml.so.6
%dir %{_libdir}/qt6/qml/org/kde/config
+%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/config/libKF6ConfigQmlplugin.so
+%{_libdir}/qt6/qml/org/kde/config/KF6ConfigQml.qmltypes
%{_libdir}/qt6/qml/org/kde/config/kde-qmlmodule.version
%{_libdir}/qt6/qml/org/kde/config/qmldir
-%attr(755,root,root) %{_libdir}/libKF6ConfigQml.so.*.*
-%attr(755,root,root) %{_libdir}/libKF6ConfigGui.so.*.*
-%attr(755,root,root) %{_bindir}/kreadconfig6
-%attr(755,root,root) %{_bindir}/kwriteconfig6
-%attr(755,root,root) %{_libexecdir}/kf6/kconf_update
-%attr(755,root,root) %{_libexecdir}/kf6/kconfig_compiler_kf6
%dir %{_datadir}/kconf_update
%{_datadir}/qlogging-categories6/kconfig.categories
%{_datadir}/qlogging-categories6/kconfig.renamecategories
-%{_libdir}/qt6/qml/org/kde/config/KF6ConfigQml.qmltypes
-%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/config/libKF6ConfigQmlplugin.so
%files devel
%defattr(644,root,root,755)
%{_libdir}/libKF6ConfigCore.so
%{_libdir}/libKF6ConfigGui.so
%{_libdir}/libKF6ConfigQml.so
+%{_includedir}/KF6/KConfig
%{_includedir}/KF6/KConfigCore
%{_includedir}/KF6/KConfigGui
%{_includedir}/KF6/KConfigQml
-%{_includedir}/KF6/KConfig
%{_libdir}/cmake/KF6Config
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kf6-kconfig.git/commitdiff/9983744619cc6808dbaf64c263bc52eb3f92a90c
More information about the pld-cvs-commit
mailing list