From 0dc6e76a5e73b7327bd9154b3a24754f6c958bf7 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 15 Mar 2024 16:41:25 +0100 Subject: [PATCH] Revert "- 24.01.95" This reverts commit c9efaeeca53fa6f2fa37acf8224b8e832a768a53. --- ka5-krdc.spec | 111 +++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/ka5-krdc.spec b/ka5-krdc.spec index 8546088..bab0b39 100644 --- a/ka5-krdc.spec +++ b/ka5-krdc.spec @@ -1,43 +1,42 @@ # # Conditional build: %bcond_with tests # build with tests -%define kdeappsver 24.01.95 +%define kdeappsver 23.08.4 %define kframever 5.94.0 %define qtver 5.15.2 %define kaname krdc Summary: krdc Name: ka5-%{kaname} -Version: 24.01.95 -Release: 0.1 +Version: 23.08.4 +Release: 1 License: GPL v2+/LGPL v2.1+ Group: X11/Applications -Source0: https://download.kde.org/unstable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz -# Source0-md5: 8726982db58be665741aaf6beeb2d9c9 +Source0: https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz +# Source0-md5: 74ede1f4b4c160674f7396a078954a50 URL: http://www.kde.org/ -BuildRequires: Qt6Core-devel >= %{qtver} -BuildRequires: Qt6Gui-devel >= %{qtver} -BuildRequires: Qt6Widgets-devel >= %{qtver} +BuildRequires: Qt5Core-devel >= %{qtver} +BuildRequires: Qt5Gui-devel >= %{qtver} +BuildRequires: Qt5Widgets-devel >= %{qtver} BuildRequires: cmake >= 3.20 -BuildRequires: freerdp2-devel >= 2.10 BuildRequires: gettext-devel -BuildRequires: kf6-extra-cmake-modules >= %{kframever} -BuildRequires: kf6-kbookmarks-devel >= %{kframever} -BuildRequires: kf6-kcmutils-devel >= %{kframever} -BuildRequires: kf6-kcompletion-devel >= %{kframever} -BuildRequires: kf6-kconfig-devel >= %{kframever} -BuildRequires: kf6-kconfigwidgets-devel >= %{kframever} -BuildRequires: kf6-kcoreaddons-devel >= %{kframever} -BuildRequires: kf6-kdnssd-devel >= %{kframever} -BuildRequires: kf6-kdoctools-devel >= %{kframever} -BuildRequires: kf6-ki18n-devel >= %{kframever} -BuildRequires: kf6-kiconthemes-devel >= %{kframever} -BuildRequires: kf6-knotifications-devel >= %{kframever} -BuildRequires: kf6-knotifyconfig-devel >= %{kframever} -BuildRequires: kf6-kservice-devel >= %{kframever} -BuildRequires: kf6-kwallet-devel >= %{kframever} -BuildRequires: kf6-kwidgetsaddons-devel >= %{kframever} -BuildRequires: kf6-kwindowsystem-devel >= %{kframever} -BuildRequires: kf6-kxmlgui-devel >= %{kframever} +BuildRequires: kf5-extra-cmake-modules >= %{kframever} +BuildRequires: kf5-kbookmarks-devel >= %{kframever} +BuildRequires: kf5-kcmutils-devel >= %{kframever} +BuildRequires: kf5-kcompletion-devel >= %{kframever} +BuildRequires: kf5-kconfig-devel >= %{kframever} +BuildRequires: kf5-kconfigwidgets-devel >= %{kframever} +BuildRequires: kf5-kcoreaddons-devel >= %{kframever} +BuildRequires: kf5-kdnssd-devel >= %{kframever} +BuildRequires: kf5-kdoctools-devel >= %{kframever} +BuildRequires: kf5-ki18n-devel >= %{kframever} +BuildRequires: kf5-kiconthemes-devel >= %{kframever} +BuildRequires: kf5-knotifications-devel >= %{kframever} +BuildRequires: kf5-knotifyconfig-devel >= %{kframever} +BuildRequires: kf5-kservice-devel >= %{kframever} +BuildRequires: kf5-kwallet-devel >= %{kframever} +BuildRequires: kf5-kwidgetsaddons-devel >= %{kframever} +BuildRequires: kf5-kwindowsystem-devel >= %{kframever} +BuildRequires: kf5-kxmlgui-devel >= %{kframever} BuildRequires: libssh-devel BuildRequires: libvncserver-devel >= 0.9 BuildRequires: ninja @@ -46,24 +45,24 @@ BuildRequires: rpmbuild(macros) >= 1.736 BuildRequires: shared-mime-info BuildRequires: tar >= 1:1.22 BuildRequires: xz -Requires: Qt6Core >= %{qtver} -Requires: Qt6Gui >= %{qtver} -Requires: Qt6Widgets >= %{qtver} -Requires: kf6-kbookmarks >= %{kframever} -Requires: kf6-kcmutils >= %{kframever} -Requires: kf6-kcompletion >= %{kframever} -Requires: kf6-kconfig >= %{kframever} -Requires: kf6-kconfigwidgets >= %{kframever} -Requires: kf6-kcoreaddons >= %{kframever} -Requires: kf6-kdnssd >= %{kframever} -Requires: kf6-ki18n >= %{kframever} -Requires: kf6-knotifications >= %{kframever} -Requires: kf6-knotifyconfig >= %{kframever} -Requires: kf6-kservice >= %{kframever} -Requires: kf6-kwallet >= %{kframever} -Requires: kf6-kwidgetsaddons >= %{kframever} -Requires: kf6-kwindowsystem >= %{kframever} -Requires: kf6-kxmlgui >= %{kframever} +Requires: Qt5Core >= %{qtver} +Requires: Qt5Gui >= %{qtver} +Requires: Qt5Widgets >= %{qtver} +Requires: kf5-kbookmarks >= %{kframever} +Requires: kf5-kcmutils >= %{kframever} +Requires: kf5-kcompletion >= %{kframever} +Requires: kf5-kconfig >= %{kframever} +Requires: kf5-kconfigwidgets >= %{kframever} +Requires: kf5-kcoreaddons >= %{kframever} +Requires: kf5-kdnssd >= %{kframever} +Requires: kf5-ki18n >= %{kframever} +Requires: kf5-knotifications >= %{kframever} +Requires: kf5-knotifyconfig >= %{kframever} +Requires: kf5-kservice >= %{kframever} +Requires: kf5-kwallet >= %{kframever} +Requires: kf5-kwidgetsaddons >= %{kframever} +Requires: kf5-kwindowsystem >= %{kframever} +Requires: kf5-kxmlgui >= %{kframever} Requires: libvncserver >= 0.9 Suggests: freerdp2-x11 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -100,8 +99,7 @@ Pliki nagłówkowe dla programistów używających %{kaname}. %{!?with_tests:-DBUILD_TESTING=OFF} \ -DFREERDP_EXECUTABLE:PATH=/usr/bin/xfreerdp \ -DHTML_INSTALL_DIR=%{_kdedocdir} \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DQT_MAJOR_VERSION=6 + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON %ninja_build -C build %if %{with tests} @@ -125,19 +123,20 @@ rm -rf $RPM_BUILD_ROOT %files -f %{kaname}.lang %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/krdc -%attr(755,root,root) %{_libdir}/libkrdccore.so.*.* +%attr(755,root,root) %{_libdir}/libkrdccore.so.*.*.* %ghost %{_libdir}/libkrdccore.so.5 -%dir %{_libdir}/qt6/plugins/krdc -%dir %{_libdir}/qt6/plugins/krdc/kcms -%attr(755,root,root) %{_libdir}/qt6/plugins/krdc/kcms/libkcm_krdc_rdpplugin.so -%attr(755,root,root) %{_libdir}/qt6/plugins/krdc/kcms/libkcm_krdc_vncplugin.so -%attr(755,root,root) %{_libdir}/qt6/plugins/krdc/libkrdc_rdpplugin.so -%attr(755,root,root) %{_libdir}/qt6/plugins/krdc/libkrdc_testplugin.so -%attr(755,root,root) %{_libdir}/qt6/plugins/krdc/libkrdc_vncplugin.so +%dir %{_libdir}/qt5/plugins/krdc +%attr(755,root,root) %{_libdir}/qt5/plugins/krdc/libkrdc_testplugin.so %{_desktopdir}/org.kde.krdc.desktop %{_datadir}/config.kcfg/krdc.kcfg %{_datadir}/metainfo/org.kde.krdc.appdata.xml -%{_datadir}/qlogging-categories6/krdc.categories +%dir %{_libdir}/qt5/plugins/krdc/kcms +%attr(755,root,root) %{_libdir}/qt5/plugins/krdc/kcms/libkcm_krdc_vncplugin.so +%attr(755,root,root) %{_libdir}/qt5/plugins/krdc/libkrdc_vncplugin.so +%attr(755,root,root) %{_libdir}/qt5/plugins/krdc/kcms/libkcm_krdc_rdpplugin.so +%attr(755,root,root) %{_libdir}/qt5/plugins/krdc/libkrdc_rdpplugin.so +%{_datadir}/qlogging-categories5/krdc.categories +%{_datadir}/kio/servicemenus/smb2rdc.desktop %files devel %defattr(644,root,root,755) -- 2.44.0