Compare commits

...
Sign in to create a new pull request.

14 commits

Author SHA1 Message Date
Orion Poplawski
246185bec8 Add sysusers config for x2goprint user (fixes FTI rhbz#2383859) 2025-08-19 21:30:05 -06:00
Orion Poplawski
ddd9a19a35 Convert to %autorelease and %autochangelog
[skip changelog]
2025-08-19 21:22:32 -06:00
Orion Poplawski
dd81eff20f Handle F42 sbin merge 2025-08-19 21:21:41 -06:00
Orion Poplawski
15f127616d Cleanup old conditionals 2025-08-19 21:21:38 -06:00
Fedora Release Engineering
b27889f76d Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:36:06 +00:00
Zbigniew Jędrzejewski-Szmek
36f050255f Add sysusers.d config file to allow rpm to create users/groups automatically
See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
2025-02-11 17:03:13 +01:00
Orion Poplawski
ed0f9121ba Define SBINDIR for sbin merge (FTBFS rhbz#2341558) 2025-01-23 17:53:30 -07:00
Fedora Release Engineering
f82646372d Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:22:25 +00:00
Miroslav Suchý
01c3b85d33 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 04:02:26 +02:00
Fedora Release Engineering
aaeb0b9561 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:39:47 +00:00
Fedora Release Engineering
28c93eaabd Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 09:16:59 +00:00
Orion Poplawski
809ada9fcd Fix typo in description (bz#2251291) 2023-11-25 13:59:48 -07:00
Orion Poplawski
751b3e84ba Update to 4.1.0.6 2023-08-17 22:23:54 -06:00
Fedora Release Engineering
47ab04c96e Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:28:38 +00:00
4 changed files with 344 additions and 356 deletions

1
.gitignore vendored
View file

@ -19,3 +19,4 @@
/x2goserver-4.1.0.2.tar.gz
/x2goserver-4.1.0.3.tar.gz
/x2goserver-4.1.0.4.tar.gz
/x2goserver-4.1.0.6.tar.gz

316
changelog Normal file
View file

@ -0,0 +1,316 @@
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.1.0.6-8
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Fri Jan 24 2025 Orion Poplawski <orion@nwra.com> - 4.1.0.6-7
- Define SBINDIR for sbin merge (FTBFS rhbz#2341558)
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.1.0.6-5
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Nov 25 2023 Orion Poplawski <orion@nwra.com> - 4.1.0.6-2
- Fix typo in description (bz#2251291)
* Fri Aug 18 2023 Orion Poplawski <orion@nwra.com> - 4.1.0.6-1
- Update to 4.1.0.6
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue May 30 2023 Orion Poplawski <orion@nwra.com> - 4.1.0.4-1
- Update to 4.1.0.4
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-18
- Perl 5.36 rebuild
* Fri Feb 04 2022 Orion Poplawski <orion@nwra.com> - 4.1.0.3-17
- Add upstream patch to fix x2goversion (bz#2050350)
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 19 2022 Orion Poplawski <orion@nwra.com> - 4.1.0.3-15
- Add Requires on xwininfo and xmessage (bz#2025390)
* Tue Nov 16 2021 René Genz <liebundartig@freenet.de> - 4.1.0.3-14
- fix typing mistakes
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-12
- Perl 5.34 rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.1.0.3-11
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 06 2020 Orion Poplawski <orion@nwra.com> - 4.1.0.3-9
- Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-7
- Perl 5.32 rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-4
- Perl 5.30 rebuild
* Thu Apr 18 2019 Orion Poplawski <orion@nwra.com> - 4.1.0.3-3
- Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167)
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Nov 29 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.3-1
- Update to 4.1.0.3
* Tue Aug 14 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.2-1
- Update to 4.1.0.2
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 4.1.0.1-2
- Rebuild with fixed binutils
* Sun Jul 29 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.1-1
- Update to 4.1.0.1
* Fri Jul 20 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.0-4
- Add BR gcc
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.0-2
- Perl 5.28 rebuild
* Mon Mar 5 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.0-1
- Update to 4.1.0.0
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Nov 11 2017 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.22-1
- Update to 4.0.1.22
* Wed Nov 8 2017 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.21-1
- Update to 4.0.1.21
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.20-3
- Perl 5.26 rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Nov 20 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.20-1
- Update to 4.0.1.20
- Drop patches applied upstream
* Thu Oct 6 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-12
- Fix x2golistdesktops on EL7 (bug #1371690)
* Fri Jun 24 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-11
- Add upstream patch to drop blowfish cipher (bug #1350014)
* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.19-10
- Perl 5.24 rebuild
* Fri Mar 18 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-9
- Add requires grep (bug #1319154)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.19-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Jun 12 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-6
- Fix X2Go capitalization in service file (bug #1231177)
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.19-5
- Perl 5.22 rebuild
* Wed Apr 29 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-4
- Add requires xorg-x11-xkb-utils
* Sun Apr 26 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-3
- Install applications symlink by default so that "Published
Applications" is populated (bug #1215474)
* Wed Mar 18 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-2
- Provide x2goserver-extensions for upstream compatibility
* Tue Feb 24 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-1
- Update to 4.0.1.19
- Drop Xsession and path patches fixed upstream
* Mon Jan 26 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-6
- Obsolete x2goserver-extensions to provide upgrade path from upstream rpms
* Thu Jan 8 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-5
- Fix local desktop sharing breakage (bug #1180303)
* Tue Dec 9 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-4
- Apply upstream fix for issue with Xsession aborting
* Fri Oct 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-3
- Do not require x2goserver-xession, do not ship feature file in main package
* Fri Oct 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-2
- Require x2goserver-xession
* Mon Oct 06 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-1
- Update to 4.0.1.18
* Fri Oct 03 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.17-1
- Update to 4.0.1.17
* Thu Oct 02 2014 Rex Dieter <rdieter@fedoraproject.org> 4.0.1.16-2
- -fmbindings: update mime scriptlets
* Thu Sep 25 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.16-1
- Update to 4.0.1.16
* Tue Sep 09 2014 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.15-7
- Perl 5.20 mass
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.15-6
- Perl 5.20 rebuild
* Tue Aug 26 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-5
- Fix scriptlet requires
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 2 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-2
- Add Requires xorg-x11-xauth
* Thu Apr 3 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-1
- Update to 4.0.1.15
* Wed Apr 2 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.14-1
- Update to 4.0.1.14
* Mon Mar 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-4
- Create /tmp/.X11-unix with correct SELinux context (bug #1079772)
* Wed Feb 5 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-3
- Fix x2gocleansession.service unit file
* Mon Jan 27 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-2
- Fix xinitrd.d path in Xsession
* Sun Jan 26 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-1
- Update 4.0.1.13
- Add xsession sub-package
* Tue Jan 7 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.12-1
- Update 4.0.1.12
* Mon Jan 6 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.11-1
- Update 4.0.1.11
- Drop mimetype patch applied upstream
* Fri Jan 3 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.10-1
- Update to 4.0.1.10
- Drop pwgen and mktemp patches applied upstream
* Sat Dec 7 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.9-2
- Disable Xsession support for now - Debian specific (Bug #1038834)
* Mon Dec 2 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.9-1
- Update to 4.0.1.9
- Drop incorrect keyboard patch
* Wed Nov 27 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-2
- Use mktemp instead of tempfile
- BR xorg-x11-xinit for Xsession.d link creation
- Add patch to fix keyboard setting (bug #1033876)
* Sat Nov 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-1
- Update to 4.0.1.8
- Fix x2gocleansessions init script for EL6 (bug #1031150)
* Tue Oct 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-6
- Fix bug in x2gocleansessions init script, enable by default
* Wed Sep 11 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-5
- Add some needed requires
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jul 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-3
- Mark /var/lib/x2go as a directory
- Add patch to make the following changes:
- Remove Xsession.options
- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d
- Make /etc/x2go/Xsession executable
* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-2
- Add SysV init script for EL6
* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-1
- Use 4.0.1.6 release
- Drop patches applied upstream
* Mon Jul 22 2013 Rok Mandeljc <rok.mandeljc@gmail.com> - 4.1.0.0-0.4.20130722git65169c9
- Update to latest git
- Use PREFIX=%%{_prefix} when building, not just when installing.
- Use pwgen instead of makepasswd, which is not available on Fedora.
- Fixed a missing function import in x2golistsessions.
- Added dependencies for xorg-x11-fonts-misc
- Added systemd script for session cleanup on start.
- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19.
* Thu May 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.3.20130520gitbd2cfe4
- Update to latest git
- Split out printing sub-package
* Wed Jan 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.2.20130122git
- Add post script to create session database if needed
* Tue Jan 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.1.20130122git
- Update to 4.1.0.0 git
* Fri Jan 18 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.0.0-1
- Update to 4.0.0.0
* Tue Dec 11 2012 Orion Poplawski <orion@cora.nwra.com> - 3.1.1.9-1
- Initial Fedora package

View file

@ -1 +1 @@
SHA512 (x2goserver-4.1.0.4.tar.gz) = 0bc52491e35913504bb884e4f60b80894332625d550f15926c857d33984fc842cebbb1e0f2b6f7ce9d877be5b0abe67d3579e9dcc6a4029eb7a716f655aadfd8
SHA512 (x2goserver-4.1.0.6.tar.gz) = 3c82ae5bd86dd938bedc70aa01d2d9123d749a36396f44100a7a94e58e5dba2d347fc967691fe0978b55e42b7fb90ddd065eafaba88dc6faee83c14645447e1b

View file

@ -1,11 +1,12 @@
#global commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3
Name: x2goserver
Version: 4.1.0.4
Release: 1%{?dist}
Version: 4.1.0.6
Release: %autorelease
Summary: X2Go Server
License: GPLv2+
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://www.x2go.org
Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
# git clone git://code.x2go.org/x2goserver
@ -21,12 +22,8 @@ BuildRequires: desktop-file-utils
BuildRequires: findutils
BuildRequires: perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: man2html-core
BuildRequires: systemd
%else
BuildRequires: man
%endif
# So XSESSIONDIR gets linked
BuildRequires: xorg-x11-xinit
# For x2goruncommand - for now
@ -52,20 +49,15 @@ Requires: x2goserver-common = %{version}-%{release}
Requires: xorg-x11-fonts-misc
Requires: xorg-x11-xauth
Requires: xwininfo
Requires(pre): shadow-utils
Requires(post): coreutils
Requires(post): grep
Requires(post): perl-X2Go-Server-DB
Requires(post): x2goserver-common
%if 0%{?fedora} || 0%{?rhel} >= 7
%{?systemd_requires}
%endif
%if 0%{?fedora}
Suggests: x2goserver-fmbindings = %{version}-%{release}
Suggests: x2goserver-printing = %{version}-%{release}
%endif
Requires: x2goserver-xsession = %{version}-%{release}
# Provide upgrade path from upstream rpms
@ -73,10 +65,8 @@ Requires: x2goserver-xsession = %{version}-%{release}
Obsoletes: x2goserver-extensions < %{version}-%{release}
Provides: x2goserver-extensions = %{version}-%{release}
Requires: x2goserver-xsession
%if 0%{?fedora} >= 21
Suggests: x2goserver-fmbindings
Suggests: x2goserver-printing
%endif
%{?perl_default_filter}
@ -98,7 +88,6 @@ administrations.
Summary: X2Go Server (common files)
# for useradd/groupadd
BuildRequires: shadow-utils
Requires(pre): shadow-utils
BuildArch: noarch
%description common
@ -191,9 +180,7 @@ Requires: perl(Cwd)
Requires: xmessage
# Symlinks to xinit files
Requires: xorg-x11-xinit
%if 0%{?fedora}
Requires: dbus
%endif
BuildArch: noarch
%description xsession
@ -316,7 +303,7 @@ modern desktop environments, namely desktops derived from the GNOME
desktop shell.
X2Go KDrive does not require an XServer on the client-side, only the
X11-independent x2gokdriveclient. esktop session data transfers from
X11-independent x2gokdriveclient. Desktop session data transfers from
server to client use differential image compression and image data gets
cached client-side.
@ -327,14 +314,24 @@ cached client-side.
# Don't try to be root
sed -i -e 's/-o root -g root//' */Makefile
# Create a sysusers.d config file
cat >x2goserver.sysusers.conf <<EOF
u x2gouser - 'x2go' /var/lib/x2go -
EOF
# Create a sysusers.d config file for x2goprint
cat >x2goprint.sysusers.conf <<EOF
u x2goprint - "X2Go print spooler user" /var/spool/x2goprint /sbin/nologin
EOF
%build
export PATH=%{_qt4_bindir}:$PATH
%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go
%make_build CFLAGS="%{optflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go SBINDIR=%{_sbindir}
%install
make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go
make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx LIBDIR=%{_libdir}/x2go SBINDIR=%{_sbindir}
# Make sure the .packlist file is removed from %%{perl_vendorarch}...
find %{buildroot}%{perl_vendorarch} -name .packlist -delete
@ -350,34 +347,19 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions
# Printing spool dir
mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint
%if 0%{?fedora} || 0%{?rhel} >= 7
# systemd session cleanup script
mkdir -p %{buildroot}%{_unitdir}
install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
%else
# SysV session cleanup script
mkdir -p %{buildroot}%{_initddir}
install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions
%endif
desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop
# applications link
ln -s ../..%{_datadir}/applications %{buildroot}%{_sysconfdir}/x2go/applications
# Delete tmpfiles.d configuration file on systems not using systemd.
%if 0%{?rhel} && 0%{?rhel} == 6
rm -f %{buildroot}/etc/tmpfiles.d/x2goserver.conf
%endif
install -m0644 -D x2goserver.sysusers.conf %{buildroot}%{_sysusersdir}/x2goserver.conf
install -m0644 -D x2goprint.sysusers.conf %{buildroot}%{_sysusersdir}/x2goprint.conf
%pre common
getent group x2gouser >/dev/null || groupadd -r x2gouser
getent passwd x2gouser >/dev/null || \
useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \
-c "x2go" x2gouser
exit 0
%post
# Initialize the session database
[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
@ -395,11 +377,7 @@ if ! [ -e %{_sysconfdir}/x2go/applications ]; then
ln -s ../..%{_datadir}/applications %{_sysconfdir}/x2go/applications
fi
%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_post x2gocleansessions.service
%else
/sbin/chkconfig --add x2gocleansessions
%endif
%preun
if [ "$1" = 0 ]; then
@ -408,31 +386,11 @@ if [ "$1" = 0 ]; then
fi
fi
%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_preun x2gocleansessions.service
%else
if [ "$1" = 0 ]; then
/sbin/service x2gocleansessions stop >/dev/null 2>&1
/sbin/chkconfig --del x2gocleansessions
fi
%endif
%postun
%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_postun_with_restart x2gocleansessions.service
%else
if [ "$1" -ge "1" ] ; then
/sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || :
fi
%endif
%pre printing
getent group x2goprint >/dev/null || groupadd -r x2goprint
getent passwd x2goprint >/dev/null || \
useradd -r -g x2goprint -d /var/spool/x2goprint -s /sbin/nologin \
-c "x2go" x2goprint
exit 0
%files
@ -474,12 +432,14 @@ exit 0
%{_libdir}/x2go/x2gormport
%{_libdir}/x2go/x2gosuspend-agent
%{_libdir}/x2go/x2gosyslog
%{_sbindir}/x2go*
%{_mandir}/man1/x2gooptionsstring.1*
%{_mandir}/man8/x2go*.8*
%exclude %{_mandir}/man8/x2gofm.8*
%exclude %{_mandir}/man8/x2goprint.8*
%exclude %{_mandir}/man8/x2go*-desktopsharing.8*
%if 0%{?fedora} && 0%{?fedora} < 42 || 0%{?rhel} && 0%{?rhel} < 11
%{_sbindir}/x2go*
%endif
%dir %{_datadir}/x2go/
%{_datadir}/x2go/versions/VERSION.x2goserver
%{_datadir}/x2go/versions/VERSION.x2goserver-extensions
@ -488,19 +448,13 @@ exit 0
%{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features
%attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
%ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
%if 0%{?fedora} || 0%{?rhel} >= 7
%{_unitdir}/x2gocleansessions.service
%else
%{_initddir}/x2gocleansessions
%endif
%files common
%license COPYING
%doc ChangeLog
%attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/
%if 0%{?rhel} != 6
%{_tmpfilesdir}/x2goserver.conf
%endif
%dir %{_sysconfdir}/x2go/
%dir %{_sysconfdir}/x2go/x2gosql
%dir %{_sysconfdir}/x2go/x2gosql/passwords
@ -510,6 +464,7 @@ exit 0
%{_mandir}/man5/x2goserver.conf.5.gz
%dir %{_datadir}/x2go/versions
%{_datadir}/x2go/versions/VERSION.x2goserver-common
%{_sysusersdir}/x2goserver.conf
%files desktopsharing
%license COPYING
@ -535,6 +490,7 @@ exit 0
%{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
%attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
%{_mandir}/man8/x2goprint.8*
%{_sysusersdir}/x2goprint.conf
%files xsession
%{_sysconfdir}/x2go/xinitrc.d
@ -581,7 +537,7 @@ exit 0
%license COPYING
%doc ChangeLog
%{_bindir}/x2goagent
# %{_libdir}/nx/bin/ is owned by nxagent package...
# %%{_libdir}/nx/bin/ is owned by nxagent package...
%{_libdir}/nx/bin/x2goagent
%{_datadir}/x2go/versions/VERSION.x2goserver-x2goagent
%{_datadir}/pixmaps/x2goagent.xpm
@ -599,289 +555,4 @@ exit 0
%changelog
* Tue May 30 2023 Orion Poplawski <orion@nwra.com> - 4.1.0.4-1
- Update to 4.1.0.4
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-18
- Perl 5.36 rebuild
* Fri Feb 04 2022 Orion Poplawski <orion@nwra.com> - 4.1.0.3-17
- Add upstream patch to fix x2goversion (bz#2050350)
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 19 2022 Orion Poplawski <orion@nwra.com> - 4.1.0.3-15
- Add Requires on xwininfo and xmessage (bz#2025390)
* Tue Nov 16 2021 René Genz <liebundartig@freenet.de> - 4.1.0.3-14
- fix typing mistakes
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-12
- Perl 5.34 rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.1.0.3-11
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 06 2020 Orion Poplawski <orion@nwra.com> - 4.1.0.3-9
- Change requires from xorg-x11-xkb-utils to setxkbmap (bz#1894794)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-7
- Perl 5.32 rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-4
- Perl 5.30 rebuild
* Thu Apr 18 2019 Orion Poplawski <orion@nwra.com> - 4.1.0.3-3
- Upstream replaced netstat with ss in 4.1.0.0 (bugz#1496167)
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Nov 29 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.3-1
- Update to 4.1.0.3
* Tue Aug 14 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.2-1
- Update to 4.1.0.2
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 4.1.0.1-2
- Rebuild with fixed binutils
* Sun Jul 29 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.1-1
- Update to 4.1.0.1
* Fri Jul 20 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.0-4
- Add BR gcc
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.0-2
- Perl 5.28 rebuild
* Mon Mar 5 2018 Orion Poplawski <orion@nwra.com> - 4.1.0.0-1
- Update to 4.1.0.0
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Nov 11 2017 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.22-1
- Update to 4.0.1.22
* Wed Nov 8 2017 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.21-1
- Update to 4.0.1.21
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.20-3
- Perl 5.26 rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Nov 20 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.20-1
- Update to 4.0.1.20
- Drop patches applied upstream
* Thu Oct 6 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-12
- Fix x2golistdesktops on EL7 (bug #1371690)
* Fri Jun 24 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-11
- Add upstream patch to drop blowfish cipher (bug #1350014)
* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.19-10
- Perl 5.24 rebuild
* Fri Mar 18 2016 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-9
- Add requires grep (bug #1319154)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1.19-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Jun 12 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-6
- Fix X2Go capitalization in service file (bug #1231177)
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.19-5
- Perl 5.22 rebuild
* Wed Apr 29 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-4
- Add requires xorg-x11-xkb-utils
* Sun Apr 26 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-3
- Install applications symlink by default so that "Published
Applications" is populated (bug #1215474)
* Wed Mar 18 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-2
- Provide x2goserver-extensions for upstream compatibility
* Tue Feb 24 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.19-1
- Update to 4.0.1.19
- Drop Xsession and path patches fixed upstream
* Mon Jan 26 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-6
- Obsolete x2goserver-extensions to provide upgrade path from upstream rpms
* Thu Jan 8 2015 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-5
- Fix local desktop sharing breakage (bug #1180303)
* Tue Dec 9 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-4
- Apply upstream fix for issue with Xsession aborting
* Fri Oct 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-3
- Do not require x2goserver-xession, do not ship feature file in main package
* Fri Oct 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-2
- Require x2goserver-xession
* Mon Oct 06 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.18-1
- Update to 4.0.1.18
* Fri Oct 03 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.17-1
- Update to 4.0.1.17
* Thu Oct 02 2014 Rex Dieter <rdieter@fedoraproject.org> 4.0.1.16-2
- -fmbindings: update mime scriptlets
* Thu Sep 25 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.16-1
- Update to 4.0.1.16
* Tue Sep 09 2014 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.15-7
- Perl 5.20 mass
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 4.0.1.15-6
- Perl 5.20 rebuild
* Tue Aug 26 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-5
- Fix scriptlet requires
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 2 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-2
- Add Requires xorg-x11-xauth
* Thu Apr 3 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.15-1
- Update to 4.0.1.15
* Wed Apr 2 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.14-1
- Update to 4.0.1.14
* Mon Mar 24 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-4
- Create /tmp/.X11-unix with correct SELinux context (bug #1079772)
* Wed Feb 5 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-3
- Fix x2gocleansession.service unit file
* Mon Jan 27 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-2
- Fix xinitrd.d path in Xsession
* Sun Jan 26 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.13-1
- Update 4.0.1.13
- Add xsession sub-package
* Tue Jan 7 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.12-1
- Update 4.0.1.12
* Mon Jan 6 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.11-1
- Update 4.0.1.11
- Drop mimetype patch applied upstream
* Fri Jan 3 2014 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.10-1
- Update to 4.0.1.10
- Drop pwgen and mktemp patches applied upstream
* Sat Dec 7 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.9-2
- Disable Xsession support for now - Debian specific (Bug #1038834)
* Mon Dec 2 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.9-1
- Update to 4.0.1.9
- Drop incorrect keyboard patch
* Wed Nov 27 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-2
- Use mktemp instead of tempfile
- BR xorg-x11-xinit for Xsession.d link creation
- Add patch to fix keyboard setting (bug #1033876)
* Sat Nov 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.8-1
- Update to 4.0.1.8
- Fix x2gocleansessions init script for EL6 (bug #1031150)
* Tue Oct 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-6
- Fix bug in x2gocleansessions init script, enable by default
* Wed Sep 11 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-5
- Add some needed requires
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jul 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-3
- Mark /var/lib/x2go as a directory
- Add patch to make the following changes:
- Remove Xsession.options
- Make /etc/x2go/Xsession.d point to /etc/X11/xinit/Xclients.d
- Make /etc/x2go/Xsession executable
* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-2
- Add SysV init script for EL6
* Mon Jul 29 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.1.6-1
- Use 4.0.1.6 release
- Drop patches applied upstream
* Mon Jul 22 2013 Rok Mandeljc <rok.mandeljc@gmail.com> - 4.1.0.0-0.4.20130722git65169c9
- Update to latest git
- Use PREFIX=%%{_prefix} when building, not just when installing.
- Use pwgen instead of makepasswd, which is not available on Fedora.
- Fixed a missing function import in x2golistsessions.
- Added dependencies for xorg-x11-fonts-misc
- Added systemd script for session cleanup on start.
- Fixed x2goruncommand for TERMINAL -> gnome-terminal; the latter seems to return immediately in Fedora 19.
* Thu May 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.3.20130520gitbd2cfe4
- Update to latest git
- Split out printing sub-package
* Wed Jan 23 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.2.20130122git
- Add post script to create session database if needed
* Tue Jan 22 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0.0-0.1.20130122git
- Update to 4.1.0.0 git
* Fri Jan 18 2013 Orion Poplawski <orion@cora.nwra.com> - 4.0.0.0-1
- Update to 4.0.0.0
* Tue Dec 11 2012 Orion Poplawski <orion@cora.nwra.com> - 3.1.1.9-1
- Initial Fedora package
%autochangelog