[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: contrary to other information that says "brackets" and consistent with RPM's source code, grouping is done via "(" and ")" in conditions.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 7 05:29:35 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 634cf79ddf4bb3723f465df882c5489124f0d261
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Mar 7 05:27:15 2017 +0100
x2goserver.spec: contrary to other information that says "brackets" and consistent with RPM's source code, grouping is done via "(" and ")" in conditions.
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 2 ++
x2goserver.spec | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59ba476..ef2d5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -280,6 +280,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
- Break older SLES builds on purpose to see what branch is *actually*
taken. Will be reverted shortly.
- Fix typo in %if condition (0%?{?fedora} instead of 0%{?fedora}.)
+ - Contrary to other information that says "brackets" and consistent with
+ RPM's source code, grouping is done via "(" and ")" in conditions.
* debian/po:
- Tiny fixup on author name.
* debian/control:
diff --git a/x2goserver.spec b/x2goserver.spec
index 793b3ae..60c7823 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -668,7 +668,7 @@ mkdir -p "/var/cache/gio-2.0"
# 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 }
+%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} && 0%{?fedora} < 25
@@ -686,7 +686,7 @@ if [ $1 -eq 0 ] ; then
%mime_database_postun
%desktop_database_postun
-%elif 0%{?suse_version} || { 0%{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 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} && 0%{?fedora} < 25
@@ -700,7 +700,7 @@ if [ $1 -eq 0 ] ; then
fi
%posttrans fmbindings
-%if { 0%{?fedora} && 0%{?fedora} < 24 } || { 0%{?rhel} && 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
More information about the x2go-commits
mailing list