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 b8e9824a49480a7f2cb621e2061224e0b80d03fc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 30 10:18:17 2015 +0100 "%set_permissions" / "%verify_permissions" macros are not know in SLE <= 11.3. Using "%run permissions" and "%verify permissions" instead. Conflicts (resolved by Mike Gabriel): x2goserver.spec --- debian/changelog | 2 ++ x2goserver.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0bc8d8..09d4a20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,6 +105,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + Requires (x2goserver-xsession): SUSE <= 11.3 has xorg-x11, not xinit. + No Bashisms in scriptlets. + rpmlint requires shared-mime-info at build time on SLE <= 11.3. + + "%set_permissions" / "%verify_permissions" macros are not know in SLE <= + 11.3. Using "%run permissions" and "%verify permissions" instead. [ Matthew L. Dailey ] * New upstream version (4.0.1.19): diff --git a/x2goserver.spec b/x2goserver.spec index 593f976..e1439d6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -378,7 +378,11 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi %if 0%{?suse_version} -%set_permissions %{_libdir}/x2go/x2gosqlitewrapper +%if 0%{?suse_version} <= 1130 +%run permissions +%else +%set_permissions %{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper +%endif %endif %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 @@ -418,7 +422,7 @@ fi %if 0%{?suse_version} %verifyscript -%verify_permissions %{_libdir}/x2go/x2gosqlitewrapper +%verify permissions -e %{_libdir}/x2go/x2gosqlitewrapper %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git