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 b2981880c35d1bb8f7c04243541f25f20ce86897 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 14:57:18 2014 +0100 x2goserver.spec: fix build of 4.0.1.x release series --- x2goserver.spec | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 45c1103..35e3496 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -338,6 +338,13 @@ getent passwd x2gouser >/dev/null || \ -c "x2go" x2gouser exit 0 +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} || 0%{?rhel} >= 7 +%systemd_pre x2goserver.service +%else +%service_add_pre x2goserver.service +%endif +%endif %post # Initialize the session database @@ -355,13 +362,14 @@ if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null; th fi fi +%if 0%{?suse_version} +%set_permissions %{_libdir}/x2go/x2gosqlitewrapper +%endif + %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %if 0%{?fedora} || 0%{?rhel} >= 7 %systemd_post x2goserver.service -%pre -%systemd_pre x2goserver.service - %preun %systemd_preun x2goserver.service @@ -370,9 +378,6 @@ fi %else %service_add_post x2goserver.service -%pre -%service_add_pre x2goserver.service - %preun %service_del_preun x2goserver.service @@ -383,15 +388,6 @@ fi /sbin/chkconfig --add x2goserver /sbin/service x2goserver condrestart >/dev/null 2>&1 || : -%if 0%{?suse_version} -%set_permissions %{_libdir}/x2go/x2gosqlitewrapper - - -%verifyscript -%verify_permissions %{_libdir}/x2go/x2gosqlitewrapper -%endif - - %postun if [ "$1" -ge "1" ] ; then /sbin/service x2goserver condrestart >/dev/null 2>&1 || : @@ -405,6 +401,12 @@ fi %endif +%if 0%{?suse_version} +%verifyscript +%verify_permissions %{_libdir}/x2go/x2gosqlitewrapper +%endif + + %post fmbindings /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : /usr/bin/update-desktop-database &>/dev/null || : @@ -468,9 +470,9 @@ exit 0 %dir %{_datadir}/x2go/ %dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/x2goserver.features +%dir %{_datadir}/x2go/versions/ %{_datadir}/x2go/versions/VERSION.x2goserver -%dir %{_localstatedir} -%attr(0775,root,x2gouser) %dir %{_localstatedir}/x2go/ +%attr(0775,root,x2gouser) %dir %{_localstatedir}/lib/x2go/ %ghost %attr(0660,root,x2gouser) %{_localstatedir}/lib/x2go/x2go_sessions %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 %{_unitdir}/x2goserver.service -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git