This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 3a0d285 x2goserver.spec: fix %{?fedora} macro usage. new 372964e x2goserver.spec: add the correct package name to the %posttrans scriptlet, we only need it for x2goserver-fmbindings. new 0f7f98e x2goserver.spec: make sure that we don't go into branches just because a macro is not defined on our platform. new 7c1b760 x2goserver.spec: work around a bug in SuSE's mime DB update script... new 4ea8e26 x2goserver.spec: make sure that there's always at least one (nil) command in the if command list. new 3da431b 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 master in repository x2goserver. commit 372964ec2ff1584adff3677ec15cc06b83a40513 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8844990..64cca4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -270,6 +270,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 2048e9a..d01a36f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -683,7 +683,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 master in repository x2goserver. commit 0f7f98ee307aeda8847576dc1af29e32dd1e9c3f 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64cca4d..5c53968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -272,6 +272,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 d01a36f..adcd85f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -660,10 +660,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. @@ -674,17 +679,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 master in repository x2goserver. commit 7c1b76084e9d7c985c45de4fe7ab668b5480535e 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... Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5c53968..07ac322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -274,6 +274,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 adcd85f..9ecba91 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -658,6 +658,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 @@ -677,6 +680,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 master in repository x2goserver. commit 4ea8e26278a6945506a4834d2c7287177556cbf6 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 07ac322..abdc25d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -275,6 +275,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 9ecba91..e6c5568 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -690,6 +690,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 master in repository x2goserver. commit 3da431b5eb13f3b4e68d34753aa349f9b491b0d4 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. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index abdc25d..e1c6962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -277,6 +277,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 e6c5568..6f94fc0 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -675,6 +675,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 @@ -693,6 +695,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