1
0
Ana Guerrero 2024-06-05 15:38:08 +00:00 committed by Git OBS Bridge
commit a1e6cacba4
6 changed files with 57 additions and 50 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffed3e299d11b3b6298bf5558cff9ba2b979d6d7a5cad72af0ae640a991b6203
size 74028

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmVHf5sVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+wPMQAK160yvX+7+JzmJXzhD3P6/eKKHg
/PSBJBHbWzdzS9gb496XjoH4oJQ0KjPyafqzYEpeiwgOtXHG3li+2erW7kZ+98nv
tc/hwgxPqNh+GcE4PmmxbiayJgFgZvzJ1TEuxygtWw941WkSnl3GmATIfdEdq6Uq
xLbN5lztXCGIlpPtOd0WbS1oi4TAANcp52eRWjBt39tMNVcsxgBCm3RdYbHayem3
gbTMIzZSHodjZg+2hanepRb9wiwbZHMEdp3H/1fJc+5dIdaRmoag8qNZjAebnDsx
m1PF8p82ScGAaLI7HPWJ9fpvo2NsH5pF1n2aUwqyhqn/7lqq37Eyib2ZzDqPHALJ
Mot9qHdees+xx6QPvcSkSbiOYUBW6KL5GrHJ/v1/TEk71Brl0a1Euxk+KVMMh5CL
bJk9lam4CiS8VK/DMYW8u3OiCtm/azLbZU6f0SwT/EMs6z2qvfdNNtP1V33/GwMu
r8kfbNIsWFc0cYY16uARWSXrv3oYemijmRiXyAgYRuIozWnDwZhQtSAxXItYXbOF
aw9Wcq0kELLOH9Td1WPWDvpGQiyBW2IKyyw6E1bnrS9kcP+9EoucU/CuH+vyuOfe
Ao4lpsSqZpzSOLAbO9R9jxsJM6eX8Kn4BV8YOm6ViD/qIAxrAxrG+XK198MeukB0
WWAVeQbEDqMcGbVh
=kSpC
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13e7a72686890a40b65d8ae13c79ed287eb971fbc0285769c40c8b97e7af43f7
size 74832

View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmYfrOUVHHRzdWphbjIw
MDBAZ21haWwuY29tAAoJEL55MAetIt9+/Y0QAMPF+k9tEenANOhTUEHC6M9BVSgn
sLwBjTU4b9PhGmmdyA/PLud0EwBE2/cHGmJvtofxSVw+lnj9B2SjT562TbCKzhZa
suxTngUXl5nRJwc4V+C/l4+PPUx7E6BwrZ7cB/a8nD6OW46p5Fo7k5XuS75CfZ/O
HB1zCkSfspw1VMIQjJFffKJArnkOQZvEdQLR6YorIX+i3GDZLT4eAOg2P8c4mvth
tc0ursEhOxZzsTG3eYXd/yuwHs34ovIVyOKfHhODn/Y/9daQSsUl+6iV5eaOnffl
8cDOYULTg0RkpykOR9nr4YWR1+/H++ZjF3E74tpmu7MYE85eQtkKakHvClJc5LdU
YgTSkKUxYzxTGMQSZD4QaZCopXDuKoVFStjkFm/+TSSqiKVE9V+6xa7HXnt2Ctc8
dnZEX9zpmcS2ZT6mUrsr1zPusfgVD/kFtgF0FVXup4MnMbNKCND+qRV/gvlkiNRF
KaAT3ydr2r5xPu7u7Hx4mXEiZCaCskTd9wmHYr1UjQZynXXpAOPfk05n8g8zwAQV
/rgV4a/KcnxkP3KR1+VNlTCOpDe8heQCxFn5johbf8oJRMjwDKELXKYodxtdqiFF
0lzC32OPjdy9yBTfvsHSa5890abEHJj0qfoEQuQ9c0uDMj2AqxZ0qFUWYx7WYggh
l5aUBt7HXjo/+lVu
=nyh4
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 18 00:48:42 UTC 2024 - Shawn Dunn <sfalken@opensuse.org>
- Update to 2.0.0:
* Ported to Qt6
- Specfile cleanup, and macro updating
-------------------------------------------------------------------
Sun Nov 5 21:59:27 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package lxqt-globalkeys
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: lxqt-globalkeys
Version: 1.4.0
Version: 2.0.0
Release: 0
Summary: Global keyboard shortcuts registration
License: LGPL-2.1-or-later
@ -25,17 +25,16 @@ URL: https://www.lxqt.org
Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
BuildRequires: cmake >= 3.1.0
BuildRequires: cmake >= 3.5.0
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: lxqt-build-tools-devel >= 0.13.0
BuildRequires: pkgconfig
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5UiTools) >= 5.15.0
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: cmake(KF6WindowSystem) >= 6.0.0
BuildRequires: cmake(Qt6LinguistTools) >= 6.6
BuildRequires: cmake(Qt6UiTools) >= 6.6
BuildRequires: cmake(lxqt) >= %{version}
BuildRequires: cmake(lxqt2-build-tools) >= 2.0.0
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(lxqt) >= %{version}
Requires(post): desktop-file-utils
Requires(pre): desktop-file-utils
Obsoletes: lxqt-globalkeys-qt5 < %{version}
@ -49,48 +48,49 @@ Daemon and library for global keyboard shortcuts registration
%package devel
Summary: Development files for lxqt-globalkeys
Requires: %{name} = %{version}
Requires: liblxqt-globalkeys-ui1 = %{version}
Requires: liblxqt-globalkeys1 = %{version}
Requires: liblxqt-globalkeys-ui2 = %{version}
Requires: liblxqt-globalkeys2 = %{version}
Requires: pkgconfig
%description devel
Development files for lxqt-globalkeys including headers and libraries
%package -n liblxqt-globalkeys1
%package -n liblxqt-globalkeys2
Summary: Lxqt-globalkeys libraries
# liblxqt-globalkeys0 already contained a file liblxqt-globalkeys.so.1.0.0 by mistake
Conflicts: liblxqt-globalkeys1
Conflicts: liblxqt-globalkeys0
%description -n liblxqt-globalkeys1
%description -n liblxqt-globalkeys2
lxqt-globalkeys main system library
%package -n liblxqt-globalkeys-ui1
%package -n liblxqt-globalkeys-ui2
Summary: UI lxqt-globalkeys libraries
Recommends: %{name}-lang
# liblxqt-globalkeys-ui0 already contained a file liblxqt-globalkeys-ui.so.1.0.0 by mistake
Conflicts: liblxqt-globalkeys-ui0
Conflicts: liblxqt-globalkeys-ui1
%description -n liblxqt-globalkeys-ui1
%description -n liblxqt-globalkeys-ui2
UI system libraries for lxqt-globalkeys
%prep
%setup -q
%autosetup -p1
# Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings
#find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} +
%build
%cmake -DPULL_TRANSLATIONS=No
%cmake_qt6
%{qt6_build}
%install
%cmake_install
%{qt6_install}
%fdupes -s %{buildroot}
%find_lang lxqt-config-globalkeyshortcuts --with-qt
%post -n liblxqt-globalkeys1 -p /sbin/ldconfig
%postun -n liblxqt-globalkeys1 -p /sbin/ldconfig
%post -n liblxqt-globalkeys-ui1 -p /sbin/ldconfig
%postun -n liblxqt-globalkeys-ui1 -p /sbin/ldconfig
%ldconfig_scriptlets -n liblxqt-globalkeys2
%ldconfig_scriptlets -n liblxqt-globalkeys-ui2
%files
%license LICENSE
@ -104,19 +104,19 @@ UI system libraries for lxqt-globalkeys
%files devel
%{_includedir}/%{name}
%{_includedir}/lxqt-globalkeys-ui
%{_libdir}/pkgconfig/*.pc
%{_libdir}/liblxqt-globalkeys.so
%{_libdir}/liblxqt-globalkeys-ui.so
%{_qt6_libdir}/pkgconfig/*.pc
%{_qt6_libdir}/liblxqt-globalkeys.so
%{_qt6_libdir}/liblxqt-globalkeys-ui.so
%dir %{_datadir}/cmake/lxqt-globalkeys
%dir %{_datadir}/cmake/lxqt-globalkeys-ui
%{_datadir}/cmake/lxqt-globalkeys/*
%{_datadir}/cmake/lxqt-globalkeys-ui/*
%files -n liblxqt-globalkeys1
%{_libdir}/liblxqt-globalkeys.so.1*
%files -n liblxqt-globalkeys2
%{_qt6_libdir}/liblxqt-globalkeys.so.2*
%files -n liblxqt-globalkeys-ui1
%{_libdir}/liblxqt-globalkeys-ui.so.1*
%files -n liblxqt-globalkeys-ui2
%{_qt6_libdir}/liblxqt-globalkeys-ui.so.2*
%files lang -f lxqt-config-globalkeyshortcuts.lang
%dir %{_datadir}/lxqt