[packages/kf5-kglobalaccel] Revert "- updated to 5.249.0; rel 0.1"

witekfl witekfl at pld-linux.org
Thu Mar 14 17:33:34 CET 2024


commit 9b02602553bcbd56d2ef5649f1bb0ec2071c4159
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Thu Mar 14 16:01:04 2024 +0100

    Revert "- updated to 5.249.0; rel 0.1"
    
    This reverts commit 20b5b3e3168584894265624b5d0a2f0960d2f63e.

 kf5-kglobalaccel.spec | 61 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec
index 545abee..5cb215e 100644
--- a/kf5-kglobalaccel.spec
+++ b/kf5-kglobalaccel.spec
@@ -1,23 +1,24 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeframever	5.249.0
+%define		kdeframever	5.114
 %define		qtver		5.15.2
 %define		kfname		kglobalaccel
 
 Summary:	Global desktop keyboard shortcuts
 Name:		kf5-%{kfname}
-Version:	5.249.0
-Release:	0.1
+Version:	5.114.0
+Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	https://download.kde.org/unstable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	782f309bcc38627d8e32be1430914685
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	d4b9194beb2d0f67a150354636a7d778
 URL:		http://www.kde.org/
-BuildRequires:	Qt6Core-devel >= %{qtver}
-BuildRequires:	Qt6DBus-devel >= %{qtver}
-BuildRequires:	Qt6Test-devel >= %{qtver}
-BuildRequires:	Qt6Widgets-devel >= %{qtver}
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5DBus-devel >= %{qtver}
+BuildRequires:	Qt5Test-devel >= %{qtver}
+BuildRequires:	Qt5Widgets-devel >= %{qtver}
+BuildRequires:	Qt5X11Extras-devel >= %{qtver}
 BuildRequires:	cmake >= 3.16
 BuildRequires:	kf5-extra-cmake-modules >= %{version}
 BuildRequires:	kf5-kconfig-devel >= %{version}
@@ -33,8 +34,9 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	xcb-util-keysyms-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz
-Requires:	Qt6DBus >= %{qtver}
-Requires:	Qt6Widgets >= %{qtver}
+Requires:	Qt5DBus >= %{qtver}
+Requires:	Qt5Widgets >= %{qtver}
+Requires:	Qt5X11Extras >= %{qtver}
 Requires:	kf5-dirs
 Requires:	kf5-kconfig >= %{version}
 Requires:	kf5-kcoreaddons >= %{version}
@@ -43,7 +45,7 @@ Requires:	kf5-kdbusaddons >= %{version}
 Requires:	kf5-kwindowsystem >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		qt6dir		%{_libdir}/qt6
+%define		qt5dir		%{_libdir}/qt5
 
 %description
 KGlobalAccel allows you to have global accelerators that are
@@ -55,8 +57,8 @@ Summary:	Header files for %{kfname} development
 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:	Qt6Widgets-devel >= %{qtver}
+Requires:	Qt5DBus-devel >= %{qtver}
+Requires:	Qt5Widgets-devel >= %{qtver}
 Requires:	cmake >= 3.16
 
 %description devel
@@ -85,7 +87,7 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 
-%find_lang %{kfname}6_qt --with-qm --all-name --with-kde
+%find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,18 +95,27 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{kfname}6_qt.lang
+%files -f %{kfname}5_qt.lang
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %{_libdir}/libKF6GlobalAccel.so.*.*.*
-%ghost %{_libdir}/libKF6GlobalAccel.so.6
-%{_datadir}/dbus-1/interfaces/kf6_org.kde.KGlobalAccel.xml
-%{_datadir}/dbus-1/interfaces/kf6_org.kde.kglobalaccel.Component.xml
-%{_datadir}/qlogging-categories6/kglobalaccel.categories
-%{_datadir}/qlogging-categories6/kglobalaccel.renamecategories
+%attr(755,root,root) %{_bindir}/kglobalaccel5
+%ghost %{_libdir}/libKF5GlobalAccel.so.5
+%attr(755,root,root) %{_libdir}/libKF5GlobalAccel.so.*.*
+%ghost %{_libdir}/libKF5GlobalAccelPrivate.so.5
+%attr(755,root,root) %{_libdir}/libKF5GlobalAccelPrivate.so.*.*
+%{_datadir}/dbus-1/interfaces/kf5_org.kde.KGlobalAccel.xml
+%{_datadir}/dbus-1/interfaces/kf5_org.kde.kglobalaccel.Component.xml
+%{_datadir}/dbus-1/services/org.kde.kglobalaccel.service
+%{_datadir}/kservices5/kglobalaccel5.desktop
+%dir %{_libdir}/qt5/plugins/org.kde.kglobalaccel5.platforms
+%attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so
+%{_datadir}/qlogging-categories5/kglobalaccel.categories
+%{systemduserunitdir}/plasma-kglobalaccel.service
+%{_datadir}/qlogging-categories5/kglobalaccel.renamecategories
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/KF6/KGlobalAccel
-%{_libdir}/cmake/KF6GlobalAccel
-%{_libdir}/libKF6GlobalAccel.so
+%{_includedir}/KF5/KGlobalAccel
+%{_libdir}/cmake/KF5GlobalAccel
+%{_libdir}/libKF5GlobalAccel.so
+%{qt5dir}/mkspecs/modules/qt_KGlobalAccel.pri
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-kglobalaccel.git/commitdiff/ea5dfd5a83c44bd922558cd5e0771344f71b06f0



More information about the pld-cvs-commit mailing list