This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from fd68fe4 x2goserver/bin/x2gosetkeyboard: make compatible with changes in Arctica's nxagent. new 2f340f5 debian/changelog: add closure for #1151. new ac99220 x2goserver.spec: Requires(post) does not imply Requires, and missing ones on grep and the SQLite perl module. new b39fcf4 x2goserver.spec: Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. new 72cda81 x2goserver.spec: perl(:MODULE_COMPAT...) is only needed for perl modules. new ad4e21b x2goserver.spec: fix NXLIBDIR path to use %{_libdir} directly. new 3139846 x2goserver.spec: delete .packlist which may be in different locations. new 20c6129 x2goserver.spec: sort some %files entries. new 57da9b1 x2goserver.spec: correct usage of mime and desktop database upgrade scriptlets and dependencies. new 463d650 Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros. new 23ddee4 x2goserver.spec: use Suggests instead of Recommends, as an even weaker dependency. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 28 +++++++++++++++++++- x2goserver.spec | 78 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 29 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ac99220a697a51af1510aee7db59ea850c11bee5 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:16:41 2017 -0700 x2goserver.spec: Requires(post) does not imply Requires, and missing ones on grep and the SQLite perl module. Cherry-picked from release/4.0.1.x branch. Also adds a x2goserver-common dependency as in the original patch submission. --- debian/changelog | 5 +++++ x2goserver.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e381808..e2d262d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -266,6 +266,11 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium * debian/po: - Translate DebConf templates to Finnish. + [ Orion Paplowski ] + * x2goserver.spec: + - Requires(post) does not imply Requires, and missing ones on grep and the + SQLite perl module. + -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 x2goserver (4.0.1.20-0x2go1) unstable; urgency=low diff --git a/x2goserver.spec b/x2goserver.spec index 625c9e2..173efa2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -102,6 +102,7 @@ Requires: sshfs Requires: sudo Requires: x2goagent-virtual Requires(post): grep +Requires: grep Requires: perl(File::Which) Requires: perl(File::BaseDir) @@ -135,6 +136,7 @@ Requires(postun): systemd Requires: perl-X2Go-Server = %{version}-%{release} Requires(post): perl-X2Go-Server-DB Requires(post): x2goserver-common +Requires: x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession #Recommends: x2goserver-fmbindings @@ -242,6 +244,7 @@ Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl(Config::Simple) Requires(post): perl(DBD::SQLite) +Requires: perl(DBD::SQLite) Requires: perl(DBD::Pg) %if 0%{?suse_version} Requires(pre): permissions -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 72cda81fdcb906efa9f86da8c4045449016eaa9a Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:26:07 2017 -0700 x2goserver.spec: perl(:MODULE_COMPAT...) is only needed for perl modules. Drop from x2goserver-printing and x2goserver-xsession. Cherry-picked from release/4.0.1.x branch. Also drop from x2goserver and x2goserver-common, like in the original patch. --- debian/changelog | 2 ++ x2goserver.spec | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea72736..e09a570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -271,6 +271,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Requires(post) does not imply Requires, and missing ones on grep and the SQLite perl module. - Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. + - perl(:MODULE_COMPAT...) is only needed for perl modules. Drop from + x2goserver-printing and x2goserver-xsession. -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 72d9d12..ea1b901 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -78,8 +78,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # For running any command, really. @@ -167,8 +165,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # for useradd/groupadd @@ -336,8 +332,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # for useradd/groupadd @@ -435,8 +429,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif Requires: perl(Cwd) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b39fcf469e77e15789e310ff664984af39ce2fa4 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:19:08 2017 -0700 x2goserver.spec: Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2d262d..ea72736 100644 --- a/debian/changelog +++ b/debian/changelog @@ -270,6 +270,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: - Requires(post) does not imply Requires, and missing ones on grep and the SQLite perl module. + - Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 173efa2..72d9d12 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -139,8 +139,10 @@ Requires(post): x2goserver-common Requires: x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession -#Recommends: x2goserver-fmbindings -#Recommends: x2goserver-printing +%if 0%{?fedora} >= 21 || 0%{?suse_version} >= 1110 +Recommends: x2goserver-fmbindings +Recommends: x2goserver-printing +%endif %{?perl_default_filter} -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2f340f592eec1453a69f157f771dd4ce379e178d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 6 08:46:20 2017 +0100 debian/changelog: add closure for #1151. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7896175..e381808 100644 --- a/debian/changelog +++ b/debian/changelog @@ -248,7 +248,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - x2goserver/sbin/x2gocleansessions: fix syntax error introduced in last change to this file. - x2goserver/bin/x2gosetkeyboard: make compatible with changes in - Arctica's nxagent. Also change to an all-bash algorithm. + Arctica's nxagent. Also change to an all-bash algorithm. Fixes: #1151. * x2goserver.spec: - Add mandatory perl-generators Build-Requires as per https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3139846a227657b3005f54bc5023f92b6d6fefa1 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:42:38 2017 -0700 x2goserver.spec: delete .packlist which may be in different locations. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b421275..c0e0e3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -275,6 +275,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. - perl(:MODULE_COMPAT...) is only needed for perl modules. Drop from x2goserver-printing and x2goserver-xsession. + - Delete .packlist which may be in different locations. -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 35c7b56..4ca1a58 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -511,7 +511,7 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx export NO_BRP_STALE_LINK_ERROR=yes # Make sure the .packlist file is removed from %%{perl_vendorarch}... -rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist +find %{buildroot}%{perl_vendorarch} -name .packlist | while read file; do rm -f "$file"; done # Remove placeholder files (in a way that works on EPEL-5, as well) find %{buildroot}%{_libdir}/x2go/extensions/ -type f -name ".placeholder" | while read file; do rm -f "$file"; done -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ad4e21b5c0a00da1fe15452caebc0b31489fa971 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:39:50 2017 -0700 x2goserver.spec: fix NXLIBDIR path to use %{_libdir} directly. --- debian/changelog | 2 ++ x2goserver.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e09a570..b421275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -156,6 +156,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low [ Orion Poplawski ] * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). + * x2goserver.spec: + - Fix NXLIBDIR path to use %{_libdir} directly. [ Oleksandr Shneyder ] * New upstream version (4.1.0.0): diff --git a/x2goserver.spec b/x2goserver.spec index ea1b901..35c7b56 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -500,11 +500,11 @@ sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_prefix}%{_lib}/nx +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_prefix}/%{_lib}/nx +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx # We currently need to disable the broken symlinks check on OpenSuSE, as long # as we can't pull in nx-libs 3.5.99 or higher. Once we can add it as a BuildRequires, # this env var can and should be removed again. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 57da9b17713593e771aa7d5f2b98a0d843fa9fb3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Mar 5 10:58:44 2017 +0100 x2goserver.spec: correct usage of mime and desktop database upgrade scriptlets and dependencies. Fedora mandates to not depend upon shared-mime-info, even not for the scriplets. Additionally, FC24 has deprecated usage of the mime database update scriptlet and FC25 has deprecated usage of the desktop database update scriptlet. (Open)SUSE mandates to pull in shared-mime-info and desktop-file-utils as post/postun scriptlet dependencies and provides special macros since 11.4. Older versions are handled via the usual commands. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 8 ++++++++ x2goserver.spec | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03a9374..709ed53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -254,6 +254,14 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: - Add mandatory perl-generators Build-Requires as per https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl + - Correct usage of mime and desktop database upgrade scriptlets and + dependencies. Fedora mandates to not depend upon shared-mime-info, even + not for the scriplets. Additionally, FC24 has deprecated usage of the + mime database update scriptlet and FC25 has deprecated usage of the + desktop database update scriptlet. (Open)SUSE mandates to pull in + shared-mime-info and desktop-file-utils as post/postun scriptlet + dependencies and provides special macros since 11.4. Older versions are + handled via the usual commands. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index ff38b2b..c870d6e 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -454,13 +454,19 @@ Requires: perl(Cwd) %package fmbindings Summary: X2Go Server (file manager bindings) Requires: %{name} = %{version}-%{release} -%if 0%{?suse_version} || 0%{?suse_version} <= 1130 -Requires(pre): shared-mime-info +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1130 +Requires(pre): shared-mime-info +%endif +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +%endif %endif Requires: xdg-utils -Requires: desktop-file-utils +%if 0%{?suse_version} || 0%{fedora} < 25 || 0%{?rhel} < 8 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +%endif %if 0%{?fedora} || 0%{?rhel} Group: Applications/Communications %else @@ -655,15 +661,37 @@ fi %post fmbindings -/usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null|| : +%if 0%{?suse_version} >= 1140 +%mime_database_post +%desktop_database_post +%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8 +/usr/bin/update-mime-database %{_datadir}/mime &1>/dev/null 2>/dev/null || : /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : +%elif 0%{?fedora} < 25 +/usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : +# FC 24 and higher have deprecated the mime database update scriptlet and handle changes transparently. +# FC 25 and higher have deprecated the desktop database update scriptlet and handle changes transparently. +%endif %postun fmbindings if [ $1 -eq 0 ] ; then - /usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null || : +%if 0%{?suse_version} >= 1140 + %mime_database_postun + %desktop_database_postun +%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8 + /usr/bin/update-mime-database %{_datadir}/mime &1>/dev/null 2>/dev/null || : + /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : +%elif 0%{?fedora} < 25 /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : + # Check the post scriptlet for more information. +%endif fi +%posttrans +%if 0%{?fedora} < 24 || 0%{?rhel} < 8 +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%endif + %pre printing if ! getent group x2goprint 1>/dev/null; then -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 463d650718bd9957e5bdf00cf1249316ccd3f1ee Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Mar 5 11:28:05 2017 +0100 Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros. FIXME: Not enabled by default on FC/RHEL/*SuSE. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 709ed53..09ab567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -262,6 +262,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium shared-mime-info and desktop-file-utils as post/postun scriptlet dependencies and provides special macros since 11.4. Older versions are handled via the usual commands. + - Simplify systemd usage a bit and make sure that it's restarted on Fedora + and RHEL-based distros. FIXME: Not enabled by default on FC/RHEL/*SuSE. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index c870d6e..3ddfa7a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -44,6 +44,9 @@ BuildRequires: man %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 BuildRequires: systemd +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-rpm-macros +%endif %endif # So XSESSIONDIR gets linked @@ -121,13 +124,7 @@ Requires: xorg-x11-xauth Requires: which %endif -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%endif - -%if 0%{?suse_version} && 0%{?suse_version} >= 1210 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %{?systemd_requires} %endif @@ -623,7 +620,7 @@ fi %systemd_preun x2goserver.service %postun -%systemd_postun x2goserver.service +%systemd_postun_with_restart x2goserver.service %else %service_del_preun x2goserver.service -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 20c61290e8ac4b35251d8c36281b70590a6a0ae3 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:51:30 2017 -0700 x2goserver.spec: sort some %files entries. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0e0e3c..03a9374 100644 --- a/debian/changelog +++ b/debian/changelog @@ -276,6 +276,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - perl(:MODULE_COMPAT...) is only needed for perl modules. Drop from x2goserver-printing and x2goserver-xsession. - Delete .packlist which may be in different locations. + - Sort some %files entries. -- X2Go Release Manager <git-admin@x2go.org> Sun, 20 Nov 2016 12:54:13 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index 4ca1a58..ff38b2b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -703,6 +703,7 @@ fi %{_libdir}/x2go/x2gocreatesession %{_libdir}/x2go/x2gocreateshadowsession %{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus @@ -715,13 +716,12 @@ fi %{_libdir}/x2go/x2gormforward %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent -%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* %{_mandir}/man8/x2go*.8* -%exclude %{_mandir}/man8/x2goserver-run-extensions.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* +%exclude %{_mandir}/man8/x2goserver-run-extensions.8* %dir %{_datadir}/x2go/ %dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/x2goserver.features -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 23ddee465c90dc50e3fc0afe6dc8013546c54423 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Mar 5 12:34:42 2017 +0100 x2goserver.spec: use Suggests instead of Recommends, as an even weaker dependency. We can live just fine without printing or fmbindings and no functions of the x2goserver package as well will be impacted. The DEB control file also uses "Suggests" for this. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 4 ++++ x2goserver.spec | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09ab567..1465d7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -264,6 +264,10 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium handled via the usual commands. - Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros. FIXME: Not enabled by default on FC/RHEL/*SuSE. + - Use Suggests instead of Recommends, as an even weaker dependency. We can + live just fine without printing or fmbindings and no functions of the + x2goserver package as well will be impacted. The DEB control file also + uses "Suggests" for this. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 3ddfa7a..70f0458 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -135,8 +135,8 @@ Requires: x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession %if 0%{?fedora} >= 21 || 0%{?suse_version} >= 1110 -Recommends: x2goserver-fmbindings -Recommends: x2goserver-printing +Suggests: x2goserver-fmbindings +Suggests: x2goserver-printing %endif %{?perl_default_filter} -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org