[X2Go-Commits] [x2gobroker] 01/01: x2gobroker.spec: commands don't seem to work when wrapped in curly braces (at least on *SuSE), so revert.
git-admin at x2go.org
git-admin at x2go.org
Tue Nov 13 14:54:02 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 03223b5e479eeae1b5cd63aa5a29f01e9a8439aa
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Nov 13 14:53:48 2018 +0100
x2gobroker.spec: commands don't seem to work when wrapped in curly braces (at least on *SuSE), so revert.
---
debian/changelog | 2 ++
x2gobroker.spec | 88 ++++++++++++++++++++++++++++----------------------------
2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f721047..f7db306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,6 +131,8 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
- Remove %debug_package macro usage, breaks builds nowadays.
- Pass down global flags in CFLAGS and LDFLAGS.
- Fix %{__global_ldflags} usage if variable does not exist.
+ - Commands don't seem to work when wrapped in curly braces (at least on
+ *SuSE), so revert.
-- X2Go Release Manager <git-admin at x2go.org> Wed, 05 Apr 2017 20:01:48 +0000
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 4369f06..9942cfc 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -470,25 +470,25 @@ fi
%if 0%{?suse_version}
%post -n python3-x2gobroker
-%{set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} -n python3-x2gobroker
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript -n python3-x2gobroker
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
%if 0%{?suse_version} >= 1230
%pre authservice
-%{service_add_pre} x2gobroker-authservice.service
+%service_add_pre x2gobroker-authservice.service
%endif
%post authservice
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_add_post} x2gobroker-authservice.service
+%service_add_post x2gobroker-authservice.service
%else
-%{systemd_post} x2gobroker-authservice.service
+%systemd_post x2gobroker-authservice.service
%endif
%else
/sbin/chkconfig --add 'x2gobroker-authservice'
@@ -497,19 +497,19 @@ if [ "$1" -ge "1" ] ; then
fi
%endif
%if 0%{?suse_version}
-%{set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} authservice
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript authservice
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
%preun authservice
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_del_preun} x2gobroker-authservice.service
+%service_del_preun x2gobroker-authservice.service
%else
-%{systemd_preun} x2gobroker-authservice.service
+%systemd_preun x2gobroker-authservice.service
%endif
%else
if [ "$1" = 0 ]; then
@@ -521,24 +521,24 @@ fi
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%postun authservice
%if 0%{?suse_version}
-%{service_del_postun} x2gobroker-authservice.service
+%service_del_postun x2gobroker-authservice.service
%else
-%{systemd_postun} x2gobroker-authservice.service
+%systemd_postun x2gobroker-authservice.service
%endif
%endif
%if 0%{?suse_version} >= 1230
%pre loadchecker
-%{service_add_pre} x2gobroker-loadchecker.service
+%service_add_pre x2gobroker-loadchecker.service
%endif
%post loadchecker
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_add_post} x2gobroker-loadchecker.service
+%service_add_post x2gobroker-loadchecker.service
%else
-%{systemd_post} x2gobroker-loadchecker.service
+%systemd_post x2gobroker-loadchecker.service
%endif
%else
/sbin/chkconfig --add 'x2gobroker-loadchecker'
@@ -547,19 +547,19 @@ if [ "$1" -ge "1" ] ; then
fi
%endif
%if 0%{?suse_version}
-%{set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} loadchecker
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript loadchecker
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
%preun loadchecker
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_del_preun} x2gobroker-loadchecker.service
+%service_del_preun x2gobroker-loadchecker.service
%else
-%{systemd_preun} x2gobroker-loadchecker.service
+%systemd_preun x2gobroker-loadchecker.service
%endif
%else
if [ "$1" = 0 ]; then
@@ -571,24 +571,24 @@ fi
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%postun loadchecker
%if 0%{?suse_version}
-%{service_del_postun} x2gobroker-loadchecker.service
+%service_del_postun x2gobroker-loadchecker.service
%else
-%{systemd_postun} x2gobroker-loadchecker.service
+%systemd_postun x2gobroker-loadchecker.service
%endif
%endif
%if 0%{?suse_version} >= 1230
%pre daemon
-%{service_add_pre} x2gobroker-daemon.service
+%service_add_pre x2gobroker-daemon.service
%endif
%post daemon
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_add_post} x2gobroker-daemon.service
+%service_add_post x2gobroker-daemon.service
%else
-%{systemd_post} x2gobroker-daemon.service
+%systemd_post x2gobroker-daemon.service
%endif
%else
/sbin/chkconfig --add 'x2gobroker-daemon'
@@ -597,19 +597,19 @@ if [ "$1" -ge "1" ] ; then
fi
%endif
%if 0%{?suse_version}
-%{set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} daemon
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript daemon
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
%preun daemon
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%if 0%{?suse_version}
-%{service_del_preun} x2gobroker-daemon.service
+%service_del_preun x2gobroker-daemon.service
%else
-%{systemd_preun} x2gobroker-daemon.service
+%systemd_preun x2gobroker-daemon.service
%endif
%else
if [ "$1" = 0 ]; then
@@ -621,9 +621,9 @@ fi
%if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
%postun daemon
%if 0%{?suse_version}
-%{service_del_postun} x2gobroker-daemon.service
+%service_del_postun x2gobroker-daemon.service
%else
-%{systemd_postun} x2gobroker-daemon.service
+%systemd_postun x2gobroker-daemon.service
%endif
%endif
@@ -633,11 +633,11 @@ if ! /usr/bin/getent 'group' 'x2gobroker-users' 1>'/dev/null' 2>'/dev/null'; the
/usr/sbin/groupadd -r 'x2gobroker-users'
fi
%if 0%{?suse_version}
-%{set_permissions} '/usr/bin/x2gobroker-ssh'
+%set_permissions '/usr/bin/x2gobroker-ssh'
-%{verifyscript} ssh
-%{verify_permissions} -e '/usr/bin/x2gobroker-ssh'
+%verifyscript ssh
+%verify_permissions -e '/usr/bin/x2gobroker-ssh'
%endif
%pre agent
@@ -652,23 +652,23 @@ fi
%if 0%{?suse_version}
%post agent
-%{set_permissions "%{_libexecdir}/x2go/x2gobroker-agent"
-%}set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_libexecdir}/x2go/x2gobroker-agent"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} agent
-%{verify_permissions} -e "%{_libexecdir}/x2go/x2gobroker-agent"
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript agent
+%verify_permissions -e "%{_libexecdir}/x2go/x2gobroker-agent"
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
%if 0%{?suse_version}
%post wsgi
-%{set_permissions} "%{_localstatedir}/log/x2gobroker"
+%set_permissions "%{_localstatedir}/log/x2gobroker"
-%{verifyscript} wsgi
-%{verify_permissions} -e "%{_localstatedir}/log/x2gobroker"
+%verifyscript wsgi
+%verify_permissions -e "%{_localstatedir}/log/x2gobroker"
%endif
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list