This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 002c975 x2goserver/bin/x2gosetkeyboard: make compatible with changes in Arctica's nxagent. new ea403a7 debian/changelog: add closure for #1151. new 3d4179c x2goserver.spec: Requires(post) does not imply Requires, and missing ones on grep and the SQLite perl module. new 8442242 x2goserver.spec: Fedora >= 21 and (Open)SUSE >= 11 now allow Recommends. new 4cac807 x2goserver.spec: perl(:MODULE_COMPAT...) is only needed for perl modules. new 1b7d84f x2goserver.spec: delete .packlist which may be in different locations. new 88358ab x2goserver.spec: sort some %files entries. new 4c4731a x2goserver.spec: correct usage of mime and desktop database upgrade scriptlets and dependencies. new 08fa500 Simplify systemd usage a bit and make sure that it's restarted on Fedora and RHEL-based distros. new 8210225 x2goserver.spec: use Suggests instead of Recommends, as an even weaker dependency. The 9 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 | 26 ++++++++++++++++++++- x2goserver.spec | 69 ++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 23 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 release/4.0.1.x in repository x2goserver. commit 3d4179ccb387d653d8bedfbb98c8552fa09783e2 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. --- debian/changelog | 5 +++++ x2goserver.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7f25b8c..01d3ca7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,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 bb2f204..a5bcaee 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -119,7 +119,9 @@ Requires: logcheck %endif Requires: x2goagent >= 3.5.0.25 Requires(post): grep +Requires: grep Requires(post): perl(DBD::SQLite) +Requires: perl(DBD::SQLite) Requires: perl(DBD::Pg) Requires: perl(File::Which) Requires: perl(File::BaseDir) -- 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 release/4.0.1.x in repository x2goserver. commit 844224248cd76f925a393a6642d0db162521cb32 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. --- debian/changelog | 1 + x2goserver.spec | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01d3ca7..cc5cc09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,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 a5bcaee..3d1eea4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -155,8 +155,10 @@ Requires(postun): systemd 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 release/4.0.1.x in repository x2goserver. commit ea403a71a96b89fd8c3206df7d008f34f5ace05e Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 6 08:46:20 2017 +0100 debian/changelog: add closure for #1151. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 381e652..7f25b8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,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 release/4.0.1.x in repository x2goserver. commit 08fa5002dba26ff75d0bfb47d795582f7d034b35 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. --- debian/changelog | 2 ++ x2goserver.spec | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index a832257..0a422f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,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 cdd4a4e..d7dfb0d 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 # for useradd/groupadd @@ -143,13 +146,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 @@ -491,7 +488,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 release/4.0.1.x in repository x2goserver. commit 4cac807c4afa350936e3acea042d9db4d1b4814c 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. --- debian/changelog | 2 ++ x2goserver.spec | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc5cc09..594a59b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,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 3d1eea4..2b8addc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -190,8 +190,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # for useradd/groupadd @@ -289,8 +287,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 release/4.0.1.x in repository x2goserver. commit 821022573beccade270d89853b74e3fad05ca693 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. --- debian/changelog | 4 ++++ x2goserver.spec | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a422f3..1915ce7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,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 d7dfb0d..a00e436 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -153,8 +153,8 @@ Requires: which 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 1b7d84f53f2648791c88f93fd920122721c7ca6a 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. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 594a59b..67b2d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,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 2b8addc..93f2ba2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -367,7 +367,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% make install DESTDIR=%{buildroot} PREFIX=%{_prefix} # 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 release/4.0.1.x in repository x2goserver. commit 88358aba9f6c270a4fadae067883ff85b326b1f6 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 5 15:51:30 2017 -0700 x2goserver.spec: sort some %files entries. --- debian/changelog | 1 + x2goserver.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67b2d48..73e2ee2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,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 93f2ba2..62c6b10 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -567,6 +567,7 @@ fi %{_libdir}/x2go/x2godbwrapper.pm %{_libdir}/x2go/x2goutils.pm %{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus @@ -579,14 +580,13 @@ fi %{_libdir}/x2go/x2gormforward %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent -%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* %{_mandir}/man5/x2go*.5* %{_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 release/4.0.1.x in repository x2goserver. commit 4c4731a43b8a723058af724be021623512eadfe3 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. --- debian/changelog | 8 ++++++++ x2goserver.spec | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 73e2ee2..a832257 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,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 62c6b10..cdd4a4e 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -312,13 +312,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 @@ -512,15 +518,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
-
git-admin＠x2go.org