[packages/ka5-kdeconnect-kde] Revert "- 24.01.95"
witekfl
witekfl at pld-linux.org
Fri Mar 15 17:41:24 CET 2024
commit 2362845789dc0f79c3af08b14573896195123a96
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Fri Mar 15 16:28:42 2024 +0100
Revert "- 24.01.95"
This reverts commit cd663d1167146e4e53adc111adb16ed85eb10b88.
ka5-kdeconnect-kde.spec | 229 ++++++++++++++++++++++++++++--------------------
1 file changed, 133 insertions(+), 96 deletions(-)
---
diff --git a/ka5-kdeconnect-kde.spec b/ka5-kdeconnect-kde.spec
index 1e1d1e4..1b74162 100644
--- a/ka5-kdeconnect-kde.spec
+++ b/ka5-kdeconnect-kde.spec
@@ -1,61 +1,60 @@
#
# Conditional build:
%bcond_with tests # build with tests
-%define kdeappsver 24.01.95
+%define kdeappsver 23.08.4
%define kframever 5.101.0
%define qtver 5.15.2
%define kaname kdeconnect-kde
Summary: KDE Connect - desktop app
Name: ka5-%{kaname}
-Version: 24.01.95
-Release: 0.1
+Version: 23.08.4
+Release: 1
License: BSD 3 Clause/GPL v2/GPL v3
Group: X11/Libraries
-Source0: https://download.kde.org/unstable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5: b363d9de90e869ac44dc96f017a2337b
+Source0: https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5: be5844f02d3e5f814a067cb3feaab686
URL: http://www.kde.org/
-BuildRequires: Qt6Bluetooth-devel
-BuildRequires: Qt6Core-devel >= 5.15.2
-BuildRequires: Qt6DBus-devel >= 5.15.2
-BuildRequires: Qt6Gui-devel >= 5.15.2
-BuildRequires: Qt6Multimedia-devel
-BuildRequires: Qt6Network-devel >= 5.15.2
-BuildRequires: Qt6Qml-devel >= 5.15.11
-BuildRequires: Qt6Quick-devel
-BuildRequires: Qt6Test-devel
-BuildRequires: Qt6WaylandClient-devel
+BuildRequires: Qt5Core-devel >= 5.15.2
+BuildRequires: Qt5DBus-devel >= 5.15.2
+BuildRequires: Qt5Gui-devel >= 5.15.2
+BuildRequires: Qt5Multimedia-devel
+BuildRequires: Qt5Network-devel >= 5.15.2
+BuildRequires: Qt5Qml-devel >= 5.15.11
+BuildRequires: Qt5Quick-controls2-devel
+BuildRequires: Qt5Quick-devel
+BuildRequires: Qt5Test-devel
+BuildRequires: Qt5WaylandClient-devel
+BuildRequires: Qt5X11Extras-devel
BuildRequires: cmake >= 3.20
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: gettext-devel
BuildRequires: gettext-devel
+BuildRequires: kf5-extra-cmake-modules >= 5.93.0
+BuildRequires: kf5-kauth-devel >= 5.93.0
+BuildRequires: kf5-kcmutils-devel >= 5.101.0
+BuildRequires: kf5-kconfigwidgets-devel >= 5.110.0
+BuildRequires: kf5-kcoreaddons-devel >= 5.109.0
+BuildRequires: kf5-kdbusaddons-devel >= 5.101.0
+BuildRequires: kf5-kdoctools-devel >= 5.101.0
+BuildRequires: kf5-kguiaddons-devel >= 5.101.0
+BuildRequires: kf5-ki18n-devel >= 5.101.0
+BuildRequires: kf5-kiconthemes-devel >= 5.101.0
+BuildRequires: kf5-kio-devel >= 5.101.0
+BuildRequires: kf5-kirigami2-devel >= 5.101.0
+BuildRequires: kf5-knotifications-devel >= 5.101.0
+BuildRequires: kf5-kpackage-devel
+BuildRequires: kf5-kpeople-devel >= 5.101.0
+BuildRequires: kf5-kservice-devel >= 5.101.0
+BuildRequires: kf5-kwidgetsaddons-devel >= %{kframever}
+BuildRequires: kf5-kwindowsystem-devel >= 5.101.0
+BuildRequires: kf5-modemmanager-qt-devel >= 5.101.0
BuildRequires: kf5-plasma-wayland-protocols-devel
-BuildRequires: kf6-extra-cmake-modules >= 5.93.0
-BuildRequires: kf6-kauth-devel >= 5.93.0
-BuildRequires: kf6-kcmutils-devel >= 5.101.0
-BuildRequires: kf6-kconfigwidgets-devel >= 5.110.0
-BuildRequires: kf6-kcoreaddons-devel >= 5.109.0
-BuildRequires: kf6-kdbusaddons-devel >= 5.101.0
-BuildRequires: kf6-kdoctools-devel >= 5.101.0
-BuildRequires: kf6-kguiaddons-devel >= 5.101.0
-BuildRequires: kf6-ki18n-devel >= 5.101.0
-BuildRequires: kf6-kiconthemes-devel >= 5.101.0
-BuildRequires: kf6-kio-devel >= 5.101.0
-BuildRequires: kf6-kirigami-devel >= 5.101.0
-BuildRequires: kf6-knotifications-devel >= 5.101.0
-BuildRequires: kf6-kpackage-devel
-BuildRequires: kf6-kpeople-devel >= 5.101.0
-BuildRequires: kf6-kservice-devel >= 5.101.0
-BuildRequires: kf6-kwidgetsaddons-devel >= %{kframever}
-BuildRequires: kf6-kwindowsystem-devel >= 5.101.0
-BuildRequires: kf6-modemmanager-qt-devel >= 5.101.0
-BuildRequires: kf6-qqc2-desktop-style-devel >= 5.101.0
-BuildRequires: kf6-solid-devel >= 5.101.0
-BuildRequires: libfakekey-devel
+BuildRequires: kf5-qqc2-desktop-style-devel >= 5.101.0
+BuildRequires: kf5-solid-devel >= 5.101.0
BuildRequires: ninja
-BuildRequires: pulseaudio-qt-devel >= 1.4.0
-BuildRequires: qca-qt6-devel >= 2.1.0
-BuildRequires: qt6-build >= %{qtver}
+BuildRequires: qca-qt5-devel >= 2.1.0
+BuildRequires: qt5-build >= %{qtver}
BuildRequires: rpmbuild(macros) >= 1.164
BuildRequires: shared-mime-info
BuildRequires: tar >= 1:1.22
@@ -96,8 +95,7 @@ All this is done completely wirelessly, utilising TLS encryption.
-G Ninja \
%{!?with_tests:-DBUILD_TESTING=OFF} \
-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}
@@ -130,57 +128,52 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/kdeconnect-sms
%ghost %{_libdir}/libkdeconnectcore.so.??
%attr(755,root,root) %{_libdir}/libkdeconnectcore.so.*.*.*
+%ghost %{_libdir}/libkdeconnectinterfaces.so.??
+%attr(755,root,root) %{_libdir}/libkdeconnectinterfaces.so.*.*.*
%ghost %{_libdir}/libkdeconnectpluginkcm.so.??
%attr(755,root,root) %{_libdir}/libkdeconnectpluginkcm.so.*.*.*
-%{_libdir}/libkdeconnectinterfaces.a
-%dir %{_libdir}/qt6/plugins/kdeconnect
-%dir %{_libdir}/qt6/plugins/kdeconnect/kcms
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_clipboard_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_runcommand_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_sendnotifications_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_share_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_findthisdevice_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kcms/kdeconnect_pausemusic_config.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_battery.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_bigscreen.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_clipboard.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_connectivity_report.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_contacts.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_findmyphone.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_lockdevice.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_mmtelephony.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_mousepad.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_mpriscontrol.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_mprisremote.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_notifications.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_ping.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_presenter.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_remotecommands.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_remotecontrol.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_remotekeyboard.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_remotesystemvolume.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_runcommand.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_screensaver_inhibit.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_sendnotifications.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_sftp.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_share.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_sms.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_telephony.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_virtualmonitor.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_findthisdevice.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_pausemusic.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kdeconnect/kdeconnect_systemvolume.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kdeconnect.so
-%dir %{_libdir}/qt6/qml/org/kde/kdeconnect
-%attr(755,root,root) %{_libdir}/qt6/plugins/kf6/kfileitemaction/kdeconnectfileitemaction.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/kf6/kio/kdeconnect.so
-%{_libdir}/qt6/qml/org/kde/kdeconnect/kde-qmlmodule.version
-%{_libdir}/qt6/qml/org/kde/kdeconnect/kdeconnectdeclarativeplugin.qmltypes
-%{_libdir}/qt6/qml/org/kde/kdeconnect/DBusProperty.qml
-%{_libdir}/qt6/qml/org/kde/kdeconnect/PluginChecker.qml
-%{_libdir}/qt6/qml/org/kde/kdeconnect/RemoteKeyboard.qml
-%attr(755,root,root) %{_libdir}/qt6/qml/org/kde/kdeconnect/libkdeconnectdeclarativeplugin.so
-%{_libdir}/qt6/qml/org/kde/kdeconnect/qmldir
+%dir %{_libdir}/qt5/plugins/kdeconnect
+%dir %{_libdir}/qt5/plugins/kdeconnect/kcms
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kcms/kdeconnect_clipboard_config.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kcms/kdeconnect_runcommand_config.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kcms/kdeconnect_sendnotifications_config.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kcms/kdeconnect_share_config.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_battery.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_bigscreen.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_clipboard.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_connectivity_report.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_contacts.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_findmyphone.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_lockdevice.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_mmtelephony.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_mousepad.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_mpriscontrol.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_mprisremote.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_notifications.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_photo.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_ping.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_presenter.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_remotecommands.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_remotecontrol.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_remotekeyboard.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_remotesystemvolume.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_runcommand.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_screensaver_inhibit.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_sendnotifications.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_sftp.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_share.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_sms.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_telephony.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kdeconnect/kdeconnect_virtualmonitor.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/kfileitemaction/kdeconnectfileitemaction.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/kio/kdeconnect.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_kdeconnect.so
+%dir %{_libdir}/qt5/qml/org/kde/kdeconnect
+%{_libdir}/qt5/qml/org/kde/kdeconnect/DBusProperty.qml
+%{_libdir}/qt5/qml/org/kde/kdeconnect/PluginChecker.qml
+%{_libdir}/qt5/qml/org/kde/kdeconnect/RemoteKeyboard.qml
+%attr(755,root,root) %{_libdir}/qt5/qml/org/kde/kdeconnect/libkdeconnectdeclarativeplugin.so
+%{_libdir}/qt5/qml/org/kde/kdeconnect/qmldir
%attr(755,root,root) %{_prefix}/libexec/kdeconnectd
%{_datadir}/Thunar/sendto/kdeconnect-thunar.desktop
%{_desktopdir}/kcm_kdeconnect.desktop
@@ -197,10 +190,52 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/deepin/dde-file-manager
%dir %{_datadir}/deepin/dde-file-manager/oem-menuextensions
%{_datadir}/deepin/dde-file-manager/oem-menuextensions/kdeconnect-dde.desktop
-%{_iconsdir}/hicolor/*x*/status/*.svg
-%{_iconsdir}/hicolor/scalable/apps/*.svg
-%{_datadir}/kdeconnect
-%{_datadir}/knotifications6/kdeconnect.notifyrc
+%{_iconsdir}/hicolor/16x16/status/laptopconnected.svg
+%{_iconsdir}/hicolor/16x16/status/laptopdisconnected.svg
+%{_iconsdir}/hicolor/16x16/status/laptoptrusted.svg
+%{_iconsdir}/hicolor/16x16/status/smartphoneconnected.svg
+%{_iconsdir}/hicolor/16x16/status/smartphonedisconnected.svg
+%{_iconsdir}/hicolor/16x16/status/smartphonetrusted.svg
+%{_iconsdir}/hicolor/16x16/status/tabletconnected.svg
+%{_iconsdir}/hicolor/16x16/status/tabletdisconnected.svg
+%{_iconsdir}/hicolor/16x16/status/tablettrusted.svg
+%{_iconsdir}/hicolor/16x16/status/tvconnected.svg
+%{_iconsdir}/hicolor/16x16/status/tvdisconnected.svg
+%{_iconsdir}/hicolor/16x16/status/tvtrusted.svg
+%{_iconsdir}/hicolor/22x22/status/laptopconnected.svg
+%{_iconsdir}/hicolor/22x22/status/laptopdisconnected.svg
+%{_iconsdir}/hicolor/22x22/status/laptoptrusted.svg
+%{_iconsdir}/hicolor/22x22/status/smartphoneconnected.svg
+%{_iconsdir}/hicolor/22x22/status/smartphonedisconnected.svg
+%{_iconsdir}/hicolor/22x22/status/smartphonetrusted.svg
+%{_iconsdir}/hicolor/22x22/status/tabletconnected.svg
+%{_iconsdir}/hicolor/22x22/status/tabletdisconnected.svg
+%{_iconsdir}/hicolor/22x22/status/tablettrusted.svg
+%{_iconsdir}/hicolor/22x22/status/tvconnected.svg
+%{_iconsdir}/hicolor/22x22/status/tvdisconnected.svg
+%{_iconsdir}/hicolor/22x22/status/tvtrusted.svg
+%{_iconsdir}/hicolor/32x32/status/laptopconnected.svg
+%{_iconsdir}/hicolor/32x32/status/laptopdisconnected.svg
+%{_iconsdir}/hicolor/32x32/status/laptoptrusted.svg
+%{_iconsdir}/hicolor/32x32/status/smartphoneconnected.svg
+%{_iconsdir}/hicolor/32x32/status/smartphonedisconnected.svg
+%{_iconsdir}/hicolor/32x32/status/smartphonetrusted.svg
+%{_iconsdir}/hicolor/32x32/status/tabletconnected.svg
+%{_iconsdir}/hicolor/32x32/status/tabletdisconnected.svg
+%{_iconsdir}/hicolor/32x32/status/tablettrusted.svg
+%{_iconsdir}/hicolor/32x32/status/tvconnected.svg
+%{_iconsdir}/hicolor/32x32/status/tvdisconnected.svg
+%{_iconsdir}/hicolor/32x32/status/tvtrusted.svg
+%{_iconsdir}/hicolor/scalable/apps/kdeconnect.svg
+%{_iconsdir}/hicolor/scalable/apps/kdeconnectindicator.svg
+%{_iconsdir}/hicolor/scalable/apps/kdeconnectindicatordark.svg
+%dir %{_datadir}/kdeconnect
+%{_datadir}/kdeconnect/kdeconnect_clipboard_config.qml
+%{_datadir}/kdeconnect/kdeconnect_runcommand_config.qml
+%{_datadir}/kdeconnect/kdeconnect_sendnotifications_config.qml
+%{_datadir}/kdeconnect/kdeconnect_share_config.qml
+%{_datadir}/knotifications5/kdeconnect.notifyrc
+%{_datadir}/kservices5/plasma-kdeconnect.desktop
%{_datadir}/metainfo/org.kde.kdeconnect.appdata.xml
%{_datadir}/metainfo/org.kde.kdeconnect.metainfo.xml
%{_datadir}/nautilus-python/extensions/kdeconnect-share.py
@@ -214,12 +249,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/DeviceDelegate.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/FindMyPhone.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/FullRepresentation.qml
+%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/Photo.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/RemoteCommands.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/SMS.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/Sftp.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/Share.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/VirtualMonitor.qml
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/contents/ui/main.qml
+%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/metadata.desktop
%{_datadir}/plasma/plasmoids/org.kde.kdeconnect/metadata.json
-%{_datadir}/qlogging-categories6/kdeconnect-kde.categories
+%{_datadir}/qlogging-categories5/kdeconnect-kde.categories
%{zsh_compdir}/_kdeconnect
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ka5-kdeconnect-kde.git/commitdiff/2362845789dc0f79c3af08b14573896195123a96
More information about the pld-cvs-commit
mailing list