From a08afb151b2fbbad70ecbbfe7f89dc5bea46b0ea Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 2 Aug 2013 10:37:03 -0600 Subject: [PATCH 01/44] Initial import --- .gitignore | 1 + sources | 1 + x2godesktopsharing.spec | 103 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 x2godesktopsharing.spec diff --git a/.gitignore b/.gitignore index e69de29..2526a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/x2godesktopsharing-3.1.1.0.tar.gz diff --git a/sources b/sources index e69de29..b98859c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c210e3e0210fad2da86a62563f948e6d x2godesktopsharing-3.1.1.0.tar.gz diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec new file mode 100644 index 0000000..99e8cf7 --- /dev/null +++ b/x2godesktopsharing.spec @@ -0,0 +1,103 @@ +Name: x2godesktopsharing +Version: 3.1.1.0 +Release: 3%{?dist} +Summary: Share X2Go desktops with other users + +Group: Applications/Communications +License: GPLv2+ +URL: http://www.x2go.org +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz + +BuildRequires: desktop-file-utils +BuildRequires: qt-devel +Requires: hicolor-icon-theme +Requires: x2goserver + +%description +X2Godesktopsharing is an X2Go add-on tool that allows a user to grant other +X2Go users access to the current session (shadow session support). + + +%prep +%setup -q +# Fix FSF address +sed -i -e 's/59 Temple Place/51 Franklin Street/' -e 's/Suite 330/Fifth Floor/' \ + -e 's/MA 02111-1307/MA 02110-1301/' COPYING + + +%build +qmake-qt4 +make %{?_smp_mflags} + + +%install +mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} +cp -p %{name} %{buildroot}%{_bindir}/ +desktop-file-install %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +mkdir -p %{buildroot}%{_datadir}/%{name}/icons +install -p -m 644 icons/%{name}.xpm %{buildroot}%{_datadir}/%{name}/icons/%{name}.xpm +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps +install -p -m 644 icons/128x128/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +install -p -m 644 icons/16x16/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +install -p -m 644 icons/64x64/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +install -p -m 644 icons/32x32/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +install -p -m 755 bin/* %{buildroot}%{_bindir}/ +cp -rp share/* %{buildroot}%{_datadir}/x2go/ +cp -rp man %{buildroot}%{_datadir}/ + + +%pre +# Needed for sharing a desktop with another user +getent group x2godesktopsharing >/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 COPYING +%{_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 +%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man8/x2goresume-desktopsharing.8.gz +%{_mandir}/man8/x2gosuspend-desktopsharing.8.gz +%{_mandir}/man8/x2goterminate-desktopsharing.8.gz + + +%changelog +* Thu Aug 1 2013 Orion Poplawski - 3.1.1.0-3 +- Fix description formatting +- Install scripts with correct permissions +- Fix FSF address + +* Thu Aug 1 2013 Orion Poplawski - 3.1.1.0-2 +- Create x2godesktopsharing group +- Preserve timestamps on install +- Update icon cache + +* Wed Jul 31 2013 Orion Poplawski - 3.1.1.0-1 +- Update to 3.1.1.0 + +* Mon Jun 10 2013 Orion Poplawski - 3.1.0.7-1 +- Update to 3.1.0.7 + +* Wed Feb 6 2013 Orion Poplawski - 3.1.0.6-1 +- Initial Fedora package From 6aa81b4780ea6aa5d83bff29b6df28086c66b9e5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:27:51 -0500 Subject: [PATCH 02/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 99e8cf7..b1b9879 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Share X2Go desktops with other users Group: Applications/Communications @@ -83,6 +83,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Aug 1 2013 Orion Poplawski - 3.1.1.0-3 - Fix description formatting - Install scripts with correct permissions From 76cba3ef012617f4226fc60d1b08802a57bdf310 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 14 Oct 2013 14:12:38 -0600 Subject: [PATCH 03/44] BR qt4-devel --- x2godesktopsharing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index b1b9879..26b68b4 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -9,7 +9,7 @@ URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils -BuildRequires: qt-devel +BuildRequires: qt4-devel Requires: hicolor-icon-theme Requires: x2goserver From 1a79beaa5e759ffe27398f316d536151cc1dcdeb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 14 Oct 2013 14:25:57 -0600 Subject: [PATCH 04/44] Fix desktop-file-install usage --- x2godesktopsharing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 26b68b4..3b8219c 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -33,7 +33,7 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go} cp -p %{name} %{buildroot}%{_bindir}/ -desktop-file-install %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop mkdir -p %{buildroot}%{_datadir}/%{name}/icons install -p -m 644 icons/%{name}.xpm %{buildroot}%{_datadir}/%{name}/icons/%{name}.xpm mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64,128x128}/apps From bb3ce43196479ce86f01eb1f26552ee94ca45ed9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 31 Mar 2014 14:24:32 -0600 Subject: [PATCH 05/44] Update to 3.1.1.1 (fixes bug #1065575) --- .gitignore | 1 + sources | 2 +- x2godesktopsharing.spec | 20 +++++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 2526a2e..7be6037 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /x2godesktopsharing-3.1.1.0.tar.gz +/x2godesktopsharing-3.1.1.1.tar.gz diff --git a/sources b/sources index b98859c..c3bc298 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c210e3e0210fad2da86a62563f948e6d x2godesktopsharing-3.1.1.0.tar.gz +7aa98bd96929c5f65cb8797938e3836e x2godesktopsharing-3.1.1.1.tar.gz diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 3b8219c..b99842c 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,7 +1,7 @@ Name: x2godesktopsharing -Version: 3.1.1.0 -Release: 4%{?dist} -Summary: Share X2Go desktops with other users +Version: 3.1.1.1 +Release: 1%{?dist} +Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications License: GPLv2+ @@ -14,15 +14,14 @@ Requires: hicolor-icon-theme Requires: x2goserver %description -X2Godesktopsharing is an X2Go add-on tool that allows a user to grant other -X2Go users access to the current session (shadow session support). +X2Go Desktop Sharing is an X2Go add-on tool that allows a user to +grant other X2Go users access to the current session (shadow session +support). The current session may be an X2Go session itself or simply +a local X11 session. %prep %setup -q -# Fix FSF address -sed -i -e 's/59 Temple Place/51 Franklin Street/' -e 's/Suite 330/Fifth Floor/' \ - -e 's/MA 02111-1307/MA 02110-1301/' COPYING %build @@ -64,7 +63,7 @@ fi %files -%doc COPYING +%doc COPYING debian/changelog %{_bindir}/%{name} %{_bindir}/x2goresume-desktopsharing %{_bindir}/x2gosuspend-desktopsharing @@ -83,6 +82,9 @@ fi %changelog +* Mon Mar 31 2014 Orion Poplawski - 3.1.1.1-1 +- Update to 3.1.1.1 (fixes bug #1065575) + * Sun Aug 04 2013 Fedora Release Engineering - 3.1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8e6611df3748ea96582e2739662c825a8fe7804b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 31 Mar 2014 14:31:04 -0600 Subject: [PATCH 06/44] Fix %doc --- x2godesktopsharing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index b99842c..918bb11 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -63,7 +63,7 @@ fi %files -%doc COPYING debian/changelog +%doc ChangeLog COPYING %{_bindir}/%{name} %{_bindir}/x2goresume-desktopsharing %{_bindir}/x2gosuspend-desktopsharing From 2e2718c7bfe5c0997bd6f58daee8e2250bce8032 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:05:29 -0500 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 918bb11..9b7dad7 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Mar 31 2014 Orion Poplawski - 3.1.1.1-1 - Update to 3.1.1.1 (fixes bug #1065575) From 3fc66ab086983cc8573a397c80c25f77570e9c11 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:06:54 +0000 Subject: [PATCH 08/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 9b7dad7..8851c22 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 3.1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1523a3bc036f081da421014a9f036fa8dd7b4fc7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Mar 2015 13:57:43 -0600 Subject: [PATCH 09/44] Update to 3.1.1.2 --- .gitignore | 1 + sources | 2 +- x2godesktopsharing.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7be6037..87fb38d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /x2godesktopsharing-3.1.1.0.tar.gz /x2godesktopsharing-3.1.1.1.tar.gz +/x2godesktopsharing-3.1.1.2.tar.gz diff --git a/sources b/sources index c3bc298..cfcb15e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7aa98bd96929c5f65cb8797938e3836e x2godesktopsharing-3.1.1.1.tar.gz +bd48394f5a4eaa55559622f21a5e0a79 x2godesktopsharing-3.1.1.2.tar.gz diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 8851c22..4323b3a 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing -Version: 3.1.1.1 -Release: 3%{?dist} +Version: 3.1.1.2 +Release: 1%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Tue Mar 10 2015 Orion Poplawski - 3.1.1.2-1 +- Update to 3.1.1.2 + * Mon Aug 18 2014 Fedora Release Engineering - 3.1.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 8896b25590e2d2bdec4c3ba2a43e4c35deeeb75f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:40:05 +0200 Subject: [PATCH 10/44] Rebuilt for GCC 5 C++11 ABI change --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 4323b3a..3b196ee 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Sat May 02 2015 Kalev Lember - 3.1.1.2-2 +- Rebuilt for GCC 5 C++11 ABI change + * Tue Mar 10 2015 Orion Poplawski - 3.1.1.2-1 - Update to 3.1.1.2 From c7388202bb8c740d08a78be729826f4ce3cc7c44 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:40:46 +0000 Subject: [PATCH 11/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 3b196ee..4d79481 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 3.1.1.2-2 - Rebuilt for GCC 5 C++11 ABI change From 46201f03f5c8ce793a47742c356fa318c676fffb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Feb 2016 20:50:45 -0600 Subject: [PATCH 12/44] use %qmake_qt4 macro to ensure proper build flags --- x2godesktopsharing.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 4d79481..d36cee9 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -25,7 +25,7 @@ a local X11 session. %build -qmake-qt4 +%{qmake_qt4} make %{?_smp_mflags} @@ -82,6 +82,9 @@ fi %changelog +* Tue Feb 02 2016 Rex Dieter - 3.1.1.2-4 +- use %%qmake_qt4 macro to ensure proper build flags + * Fri Jun 19 2015 Fedora Release Engineering - 3.1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 01fa2b302c84248e338908bf188f4c717837701a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:14:03 +0000 Subject: [PATCH 13/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index d36cee9..a76948a 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Feb 02 2016 Rex Dieter - 3.1.1.2-4 - use %%qmake_qt4 macro to ensure proper build flags From f86aad5f054e1930b8bfd0de30eed47bbd087634 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 6 Feb 2016 14:06:12 -0700 Subject: [PATCH 14/44] Add patch to fix abs compile error --- x2godesktopsharing-time.patch | 14 ++++++++++++++ x2godesktopsharing.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 x2godesktopsharing-time.patch diff --git a/x2godesktopsharing-time.patch b/x2godesktopsharing-time.patch new file mode 100644 index 0000000..eed747e --- /dev/null +++ b/x2godesktopsharing-time.patch @@ -0,0 +1,14 @@ +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 a76948a..e1a8626 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,12 +1,15 @@ Name: x2godesktopsharing Version: 3.1.1.2 -Release: 5%{?dist} +Release: 6%{?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 BuildRequires: desktop-file-utils BuildRequires: qt4-devel @@ -22,6 +25,7 @@ a local X11 session. %prep %setup -q +%patch0 -p1 -b .time %build @@ -82,6 +86,9 @@ fi %changelog +* Sat Feb 6 2016 Orion Poplawski - 3.1.1.2-6 +- Add patch to fix abs compile error + * Fri Feb 05 2016 Fedora Release Engineering - 3.1.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 87346fbe4486bef23ae6d5aa5742662d26a133ac Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 7 Jun 2016 12:02:18 -0600 Subject: [PATCH 15/44] Update to 3.1.1.3 - Drop time patch fixed upstream --- .gitignore | 1 + sources | 2 +- x2godesktopsharing-time.patch | 14 -------------- x2godesktopsharing.spec | 12 ++++++------ 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 x2godesktopsharing-time.patch diff --git a/.gitignore b/.gitignore index 87fb38d..40bed0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/sources b/sources index cfcb15e..44e1d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd48394f5a4eaa55559622f21a5e0a79 x2godesktopsharing-3.1.1.2.tar.gz +e5d4c4393ed5dde7e0790d7cded56cc2 x2godesktopsharing-3.1.1.3.tar.gz 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..d4283fd 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,15 +1,12 @@ Name: x2godesktopsharing -Version: 3.1.1.2 -Release: 6%{?dist} +Version: 3.1.1.3 +Release: 1%{?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 BuildRequires: desktop-file-utils BuildRequires: qt4-devel @@ -25,7 +22,6 @@ a local X11 session. %prep %setup -q -%patch0 -p1 -b .time %build @@ -86,6 +82,10 @@ fi %changelog +* 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 From 7ee4f41a829a47bc87531ce3b422125d33dd4398 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:36:47 +0000 Subject: [PATCH 16/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index d4283fd..aad1e21 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* 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 From fb4e4fb5753be0bb9980a33decf9c33842ac6a30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:50:32 +0000 Subject: [PATCH 17/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index aad1e21..5d58fe7 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* 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 From 8b7e00567a52822212c6befb4575ed683a8785f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:26:10 +0000 Subject: [PATCH 18/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 5d58fe7..6f2b8a1 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* 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 From a0836332c4f4170263c0764c3ad659ce9d1d37b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:16:22 +0000 Subject: [PATCH 19/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 6f2b8a1..113ac15 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* 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 From c01b693c59c4a209074fe0af8944befa9df708d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:03:49 +0000 Subject: [PATCH 20/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 113ac15..c8b68a3 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.1.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -82,6 +82,9 @@ fi %changelog +* 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 From 4c1c1ad0253eceab9a73ecd574945c75e2cb1538 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 28 Nov 2018 21:55:14 -0700 Subject: [PATCH 21/44] Update to 3.2.0.0 --- .gitignore | 1 + sources | 2 +- x2godesktopsharing.spec | 37 +++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 40bed0f..9dd8c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 44e1d83..cee4b72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5d4c4393ed5dde7e0790d7cded56cc2 x2godesktopsharing-3.1.1.3.tar.gz +SHA512 (x2godesktopsharing-3.2.0.0.tar.gz) = bbf23c0cf9426d8c0a9450525f5cf692a4ddd51b1b50b9c4045597ba76c3add258153f7ad832605f08a30bca1822fd868d5f6b1bbb46bf0daf53333b1656163d diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index c8b68a3..e5e6c5d 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,17 +1,19 @@ Name: x2godesktopsharing -Version: 3.1.1.3 -Release: 6%{?dist} +Version: 3.2.0.0 +Release: 1%{?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 +URL: https://www.x2go.org +Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz 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 %description X2Go Desktop Sharing is an X2Go add-on tool that allows a user to @@ -25,8 +27,9 @@ a local X11 session. %build -%{qmake_qt4} -make %{?_smp_mflags} +lrelease-qt5 x2godesktopsharing.pro +%{qmake_qt5} +%make_build %install @@ -40,8 +43,8 @@ install -p -m 644 icons/128x128/%{name}.png %{buildroot}%{_datadir}/icons/hicolo install -p -m 644 icons/16x16/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png install -p -m 644 icons/64x64/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png install -p -m 644 icons/32x32/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -p -m 755 bin/* %{buildroot}%{_bindir}/ -cp -rp share/* %{buildroot}%{_datadir}/x2go/ +mkdir -p %{buildroot}%{_datadir}/x2go/versions +install -p -m 644 VERSION.x2godesktopsharing %{buildroot}%{_datadir}/x2go/versions/VERSION.x2godesktopsharing cp -rp man %{buildroot}%{_datadir}/ @@ -63,25 +66,23 @@ fi %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 %changelog +* 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 From 87ea65d360f1b09e0c546fc33f1f9490e4ba0067 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 4 Dec 2018 21:18:50 -0700 Subject: [PATCH 22/44] Add Recommends x2goserver-desktopsharing --- x2godesktopsharing.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e5e6c5d..4543a21 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications @@ -14,6 +14,12 @@ BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-linguist Requires: hicolor-icon-theme 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 @@ -80,6 +86,9 @@ fi %changelog +* 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 From 7b12d1423534d733c894e5217c349f4773b7a79d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 13:20:52 +0100 Subject: [PATCH 23/44] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- x2godesktopsharing.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 4543a21..0560bd1 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -58,19 +58,6 @@ cp -rp man %{buildroot}%{_datadir}/ # Needed for sharing a desktop with another user getent group x2godesktopsharing >/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 %license COPYING %doc ChangeLog From 48d9b8d375348420602b4ae90e09685757b0cf9b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 24/44] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- x2godesktopsharing.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 0560bd1..a1b5c01 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -3,7 +3,6 @@ Version: 3.2.0.0 Release: 2%{?dist} Summary: Share X11 desktops with other users via X2Go -Group: Applications/Communications License: GPLv2+ URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz From b791d9bff4e2caccad87de778ded354deebe77ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:02:41 +0000 Subject: [PATCH 25/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index a1b5c01..306f0b9 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -72,6 +72,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From eec48ee98f9a1c5313e9a26177526fa0525a6338 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:49:10 +0000 Subject: [PATCH 26/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 306f0b9..584627d 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -72,6 +72,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 4e483da632f7ffcbbc2fb5d30475c58de68e3f10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:02:51 +0000 Subject: [PATCH 27/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 584627d..98f70a9 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -72,6 +72,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From a6567b138c68ec84091b207bebbbb26f93e7b5ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:24:49 +0000 Subject: [PATCH 28/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 98f70a9..851913d 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -72,6 +72,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From ce483f6b449c1a7165ae00216b35f4b91983e3c7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:05:35 +0000 Subject: [PATCH 29/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- x2godesktopsharing.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 851913d..68fb77a 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -7,6 +7,7 @@ License: GPLv2+ URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel From f100b2b6f5b4739e4ff822b394238ff1d5feaf49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:45:22 +0000 Subject: [PATCH 30/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 68fb77a..59079ba 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 3b765ee0b0aa2b79c3e6067ccf499f10fd96cd8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:14:27 +0000 Subject: [PATCH 31/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 59079ba..cf51623 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 3deab799bdb9645006bbe7b00a98d65584cd4583 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:46:03 +0000 Subject: [PATCH 32/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index cf51623..476645c 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 6e75ee873201ca5e2927b43a2b8ad8489eb0c63c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 18:02:44 -0800 Subject: [PATCH 33/44] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .gitignore | 0 dead.package | 1 + sources | 0 3 files changed, 1 insertion(+) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 63a82971ad878f7535a2b7880e1bda0796577bcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:44:20 +0000 Subject: [PATCH 34/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 476645c..ea989f6 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From beb4d42ad2a319819e3ad9f944e8d995af22b390 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:06:09 +0000 Subject: [PATCH 35/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index ea989f6..240c0a1 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 6b9a291f49b72e9289801d80eca46dd00dfd2107 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:28:29 +0000 Subject: [PATCH 36/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 240c0a1..935d798 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From edbd2a1f7af7df174eade0a31a6e3a39ce65ec92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:16:31 +0000 Subject: [PATCH 37/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 935d798..24582e5 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 31af9e9e69bb9ab25cd04addc071fe71821b6389 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:39:16 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 24582e5..e74ea0a 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Share X11 desktops with other users via X2Go License: GPLv2+ @@ -73,6 +73,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 8423ae4538d5d9b1cb85e660351a0cc0b1226837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:02:11 +0200 Subject: [PATCH 39/44] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- x2godesktopsharing.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e74ea0a..14bbe15 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,9 +1,10 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Share X11 desktops with other users via X2Go -License: GPLv2+ +# 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 @@ -73,6 +74,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From 69b33a53d0b787bf463add8faf0e4475344dc3ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:21:51 +0000 Subject: [PATCH 40/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 14bbe15..302a709 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Share X11 desktops with other users via X2Go # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -74,6 +74,9 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %changelog +* 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 From d09dc489995122f756c0c37f3c92bb2abaca9f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:13 +0100 Subject: [PATCH 41/44] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- x2godesktopsharing.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 302a709..e34c644 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Share X11 desktops with other users via X2Go # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -32,6 +32,11 @@ a local X11 session. %prep %setup -q +# Create a sysusers.d config file +cat >x2godesktopsharing.sysusers.conf </dev/null || groupadd -r x2godesktopsharing %files %license COPYING @@ -71,9 +75,13 @@ getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %{_datadir}/x2go/versions/VERSION.x2godesktopsharing %{_mandir}/man1/%{name}.1.gz +%{_sysusersdir}/x2godesktopsharing.conf %changelog +* 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 From e3089f51f24e9994490b4e7c7f7bf6d5abd84796 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:35:49 +0000 Subject: [PATCH 42/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e34c644..f8410a0 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Share X11 desktops with other users via X2Go # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -79,6 +79,9 @@ install -m0644 -D x2godesktopsharing.sysusers.conf %{buildroot}%{_sysusersdir}/x %changelog +* 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 From 4e1c531556aebc9dfd7e69d381f8f1be1ed2ac56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:25:26 +0000 Subject: [PATCH 43/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index f8410a0..a500eb0 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Share X11 desktops with other users via X2Go # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -79,6 +79,9 @@ install -m0644 -D x2godesktopsharing.sysusers.conf %{buildroot}%{_sysusersdir}/x %changelog +* 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 From 73413776f241d03b01fe1f83fd212abb48accdb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:58:58 +0000 Subject: [PATCH 44/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- x2godesktopsharing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index a500eb0..b1e156b 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,6 +1,6 @@ Name: x2godesktopsharing Version: 3.2.0.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Share X11 desktops with other users via X2Go # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -79,6 +79,9 @@ install -m0644 -D x2godesktopsharing.sysusers.conf %{buildroot}%{_sysusersdir}/x %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