diff --git a/.gitignore b/.gitignore index 87fb38d..9dd8c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /x2godesktopsharing-3.1.1.0.tar.gz /x2godesktopsharing-3.1.1.1.tar.gz /x2godesktopsharing-3.1.1.2.tar.gz +/x2godesktopsharing-3.1.1.3.tar.gz +/x2godesktopsharing-3.2.0.0.tar.gz diff --git a/sources b/sources index cfcb15e..cee4b72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd48394f5a4eaa55559622f21a5e0a79 x2godesktopsharing-3.1.1.2.tar.gz +SHA512 (x2godesktopsharing-3.2.0.0.tar.gz) = bbf23c0cf9426d8c0a9450525f5cf692a4ddd51b1b50b9c4045597ba76c3add258153f7ad832605f08a30bca1822fd868d5f6b1bbb46bf0daf53333b1656163d diff --git a/x2godesktopsharing-time.patch b/x2godesktopsharing-time.patch deleted file mode 100644 index eed747e..0000000 --- a/x2godesktopsharing-time.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up x2godesktopsharing-3.1.1.2/sharetray.cpp.time x2godesktopsharing-3.1.1.2/sharetray.cpp ---- x2godesktopsharing-3.1.1.2/sharetray.cpp.time 2015-03-05 21:11:16.000000000 -0700 -+++ x2godesktopsharing-3.1.1.2/sharetray.cpp 2016-02-06 13:57:28.437811687 -0700 -@@ -93,8 +93,8 @@ ShareTray::ShareTray() - { - QString line = in.readLine(); - file.close(); -- if ( abs ( line.toUInt() - -- QDateTime::currentDateTime().toTime_t() ) <5 ) -+ if ( abs ( int ( line.toUInt() - -+ QDateTime::currentDateTime().toTime_t() ) ) <5 ) - { - - QString message=QString ( diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e1a8626..b1e156b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,20 +1,26 @@ Name: x2godesktopsharing -Version: 3.1.1.2 -Release: 6%{?dist} +Version: 3.2.0.0 +Release: 20%{?dist} Summary: Share X11 desktops with other users via X2Go -Group: Applications/Communications -License: GPLv2+ -URL: http://www.x2go.org -Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -# Fix abs call with time values -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=993 -Patch0: x2godesktopsharing-time.patch +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +URL: https://www.x2go.org +Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: desktop-file-utils -BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-linguist Requires: hicolor-icon-theme -Requires: x2goserver +Requires: x2goserver >= 4.0.0.0 +%if 0%{?fedora} +Recommends: x2goserver-desktopsharing >= 4.1.0.3 +%else +Requires: x2goserver-desktopsharing >= 4.1.0.3 +%endif + %description X2Go Desktop Sharing is an X2Go add-on tool that allows a user to @@ -25,12 +31,17 @@ a local X11 session. %prep %setup -q -%patch0 -p1 -b .time + +# Create a sysusers.d config file +cat >x2godesktopsharing.sysusers.conf </dev/null || groupadd -r x2godesktopsharing - -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %{_bindir}/%{name} -%{_bindir}/x2goresume-desktopsharing -%{_bindir}/x2gosuspend-desktopsharing -%{_bindir}/x2goterminate-desktopsharing %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/64x64/apps/%{name}.png -%{_datadir}/x2go/x2gofeature.d/%{name}.features +%{_datadir}/x2go/versions/VERSION.x2godesktopsharing %{_mandir}/man1/%{name}.1.gz -%{_mandir}/man8/x2goresume-desktopsharing.8.gz -%{_mandir}/man8/x2gosuspend-desktopsharing.8.gz -%{_mandir}/man8/x2goterminate-desktopsharing.8.gz +%{_sysusersdir}/x2godesktopsharing.conf %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.2.0.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.2.0.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.2.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 3.2.0.0-17 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Sun Jan 19 2025 Fedora Release Engineering - 3.2.0.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 3.2.0.0-15 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 3.2.0.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.2.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.2.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.2.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.2.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.2.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.2.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.2.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 3.2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 4 2018 Orion Poplawski - 3.2.0.0-2 +- Add Recommends x2goserver-desktopsharing + +* Wed Nov 28 2018 Orion Poplawski - 3.2.0.0-1 +- Update to 3.2.0.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 3.1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.1.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jun 7 2016 Orion Poplawski - 3.1.1.3-1 +- Update to 3.1.1.3 +- Drop time patch fixed upstream + * Sat Feb 6 2016 Orion Poplawski - 3.1.1.2-6 - Add patch to fix abs compile error