- updated dependencies, package missing dirs

diff --git a/Qt6Keychain.spec b/Qt6Keychain.spec
index 90c093dc14ff839685494530f1588670038c24f5..0d7adfbbfd1028b4540b017f5849c5e4a1ea0d00 100644 (file)
--- a/Qt6Keychain.spec
+++ b/Qt6Keychain.spec
@@ -1,5 +1,3 @@
-#
-%define                kfname  qtkeychain
 Summary:       Qt API to store passwords and other secret data securely
 Summary(pl.UTF-8):     API Qt do bezpiecznego przechowywania haseł i innych tajnych danych
 Name:          Qt6Keychain
@@ -8,17 +6,20 @@ Release:      1
 License:       Modified BSD License
 Group:         Libraries
 #Source0Download: https://github.com/frankosterfeld/qtkeychain/releases
+# TODO use:
+#Source0:      https://github.com/frankosterfeld/qtkeychain/archive/%{version}/qtkeychain-%{version}.tar.gz
 Source0:       https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/%{version}.tar.gz
 # Source0-md5: 7f75753541784068400d903e0e7a0d55
 URL:           https://github.com/frankosterfeld/qtkeychain
-BuildRequires: Qt6Core-devel >= 5
-BuildRequires: Qt6DBus-devel >= 5
-BuildRequires: cmake >= 2.8.11
+BuildRequires: Qt6Core-devel >= 6
+BuildRequires: Qt6DBus-devel >= 6
+BuildRequires: cmake >= 3.16
 BuildRequires: libsecret-devel
 BuildRequires: libstdc++-devel
-BuildRequires: qt6-build >= 5
-BuildRequires: qt6-linguist >= 5
-BuildRequires: qt6-qmake >= 5
+BuildRequires: pkgconfig
+BuildRequires: qt6-build >= 6
+BuildRequires: qt6-linguist >= 6
+BuildRequires: qt6-qmake >= 6
 BuildRequires: rpmbuild(find_lang) >= 1.37
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,6 +51,7 @@ Summary:      Development files for Qt6Keychain
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki Qt6Keychain
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      Qt6Core-devel >= 6
 
 %description devel
 This package contains the header files for developing applications
@@ -63,12 +65,10 @@ wykorzystujących bibliotekę Qt6Keychain.
 %setup -q -n qtkeychain-%{version}
 
 %build
-install -d build-qt6
-cd build-qt6
-%cmake .. \
+%cmake -B build-qt6 \
        -DBUILD_WITH_QT6:BOOL=ON \
        -DECM_MKSPECS_INSTALL_DIR=%{_libdir}/qt6/mkspecs/modules
-%{__make}
+%{__make} -C build-qt6
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING ChangeLog
 %attr(755,root,root) %{_libdir}/libqt6keychain.so.*.*
 %ghost %{_libdir}/libqt6keychain.so.1
+%dir %{_datadir}/qt6keychain
+%dir %{_datadir}/qt6keychain/translations
 
 %files devel
 %defattr(644,root,root,755)