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 23b2080 x2goserver.spec: fix %{?fedora} macro usage. new 7920944 x2goserver.spec: add the correct package name to the %posttrans scriptlet, we only need it for x2goserver-fmbindings. new e680c9d x2goserver.spec: make sure that we don't go into branches just because a macro is not defined on our platform. new 22f2097 x2goserver.spec: work around a bug in SuSE's mime DB update script... new b5cd12f x2goserver.spec: make sure that there's always at least one (nil) command in the if command list. new a247c73 x2goserver.spec: break older SLES builds on purpose to see what branch is *actually* taken. The 5 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 | 9 +++++++++ x2goserver.spec | 28 ++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 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 7920944e52d14256b494fb6f01a58131bf2ef59e Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 03:42:38 2017 +0100 x2goserver.spec: add the correct package name to the %posttrans scriptlet, we only need it for x2goserver-fmbindings. --- debian/changelog | 2 ++ x2goserver.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2b70fa6..0f0670d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium uses "Suggests" for this. - Fix RPM spec syntax error in shared-mime-info dependency section. - Fix %{?fedora} macro usage. + - Add the correct package name to the %posttrans scriptlet, we only need + it for x2goserver-fmbindings. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 110f110..2e82ee4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -540,7 +540,7 @@ if [ $1 -eq 0 ] ; then %endif fi -%posttrans +%posttrans fmbindings %if 0%{?fedora} < 24 || 0%{?rhel} < 8 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif -- 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 e680c9d0e3075ecceaba93e57a91c704f2ccfbfb Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 04:31:24 2017 +0100 x2goserver.spec: make sure that we don't go into branches just because a macro is not defined on our platform. --- debian/changelog | 2 ++ x2goserver.spec | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f0670d..53911e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Fix %{?fedora} macro usage. - Add the correct package name to the %posttrans scriptlet, we only need it for x2goserver-fmbindings. + - Make sure that we don't go into branches just because a macro is not + defined on our platform. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 2e82ee4..debb090 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -517,10 +517,15 @@ fi %if 0%{?suse_version} >= 1140 %mime_database_post %desktop_database_post -%elif 0%{?suse_version} || 0%{?fedora} < 24 || 0%{?rhel} < 8 +# We need the "weird" foo && foo < ... structure, because we only want to check the value +# *if* the macro is defined. Otherwise it will decay to 0 which means that the branch +# is always triggered - even on operating systems for which it should not be triggered. +# For example, this branch would be taken on Fedora >= 24 if using a plain "0%{?rhel} < 8" +# condition, since this ("0 < 8") would be true on a Fedora system. +%elif 0%{?suse_version} || { 0%{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 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 +%elif 0{?fedora} && 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. @@ -531,17 +536,17 @@ if [ $1 -eq 0 ] ; then %if 0%{?suse_version} >= 1140 %mime_database_postun %desktop_database_postun -%elif 0%{?suse_version} || 0%{?fedora} < 24 || 0%{?rhel} < 8 +%elif 0%{?suse_version} || { 0%{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 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 +%elif 0{?fedora} && 0%{?fedora} < 25 /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : # Check the post scriptlet for more information. %endif fi %posttrans fmbindings -%if 0%{?fedora} < 24 || 0%{?rhel} < 8 +%if { 0%?{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 0%{?rhel} < 8 } /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %endif -- 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 22f2097b2a6adb7357adf9d974daab13122a7798 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 04:32:27 2017 +0100 x2goserver.spec: work around a bug in SuSE's mime DB update script... --- debian/changelog | 1 + x2goserver.spec | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 53911e4..a24cd26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium it for x2goserver-fmbindings. - Make sure that we don't go into branches just because a macro is not defined on our platform. + - Work around a bug in SuSE's mime DB update script... * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index debb090..281cc08 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -515,6 +515,9 @@ fi %post fmbindings %if 0%{?suse_version} >= 1140 +# Bug in SuSE's mime DB update script, work around it... +mkdir -p "/var/cache/gio-2.0" + %mime_database_post %desktop_database_post # We need the "weird" foo && foo < ... structure, because we only want to check the value @@ -534,6 +537,8 @@ fi %postun fmbindings if [ $1 -eq 0 ] ; then %if 0%{?suse_version} >= 1140 + mkdir -p "/var/cache/gio-2.0" + %mime_database_postun %desktop_database_postun %elif 0%{?suse_version} || { 0%{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 0%{?rhel} < 8 } -- 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 b5cd12ff55b14c6a52e99bbebb0c94d794ff3abc Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 04:35:24 2017 +0100 x2goserver.spec: make sure that there's always at least one (nil) command in the if command list. --- debian/changelog | 2 ++ x2goserver.spec | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index a24cd26..2bfbd79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Make sure that we don't go into branches just because a macro is not defined on our platform. - Work around a bug in SuSE's mime DB update script... + - Make sure that there's always at least one (nil) command in the if + command list. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 281cc08..3171943 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -547,6 +547,9 @@ if [ $1 -eq 0 ] ; then %elif 0{?fedora} && 0%{?fedora} < 25 /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || : # Check the post scriptlet for more information. +%else + # Need to have at least one command, do nothing. + : %endif fi -- 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 a247c73baffadfa3d869af2c2f11502054f10eaa Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 7 04:36:21 2017 +0100 x2goserver.spec: break older SLES builds on purpose to see what branch is *actually* taken. Will be reverted shortly. --- debian/changelog | 2 ++ x2goserver.spec | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2bfbd79..2c2526d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium - Work around a bug in SuSE's mime DB update script... - Make sure that there's always at least one (nil) command in the if command list. + - Break older SLES builds on purpose to see what branch is *actually* + taken. Will be reverted shortly. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 3171943..62940ad 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -532,6 +532,8 @@ mkdir -p "/var/cache/gio-2.0" /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. +%else +DELIBERATE_SYNTAX_ERROR_FOR_SUSE_TESTING %endif %postun fmbindings @@ -550,6 +552,7 @@ if [ $1 -eq 0 ] ; then %else # Need to have at least one command, do nothing. : + DELIBERATE_SYNTAX_ERROR_FOR_SUSE_TESTING_2 %endif fi -- 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