This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f988beb8e78637b0a597f9933e4cc38a14d848aa Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 13 04:27:37 2018 +0100 x2gobroker.spec: use more curly braces. --- debian/changelog | 1 + x2gobroker.spec | 310 +++++++++++++++++++++++++++---------------------------- 2 files changed, 156 insertions(+), 155 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71c2c2c..58e64d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium - Whitespace only. - Remove obsolete EPEL 5 support. - Switch to HTTPS-based links. + - Use more curly braces. -- X2Go Release Manager <git-admin@x2go.org> Wed, 05 Apr 2017 20:01:48 +0000 diff --git a/x2gobroker.spec b/x2gobroker.spec index 21029db..2adf99a 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -11,7 +11,7 @@ Group: Applications/Communications %endif Url: https://www.x2go.org/ -Source0: https://code.x2go.org/releases/source/%name/%name-%version.tar.gz +Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz Source1: x2gobroker-daemon.init Source2: x2gobroker-authservice.init Source3: x2gobroker-loadchecker.init @@ -385,7 +385,7 @@ python3 test.py echo "Files where we will be patching libexecedir:" find . -type f -exec grep -l "/usr/lib/x2go/" "{}" "+" find . -type f -exec grep -l "/usr/lib/x2go/" "{}" "+" | \ - xargs perl -i -pe 's{/usr/lib/x2go/}{%_libexecdir/x2go/}' + xargs perl -i -pe 's{/usr/lib/x2go/}{%{_libexecdir}/x2go/}' %if 0%{?el6} sed -i etc/broker/x2gobroker-sessionprofiles.conf \ -e 's/localhost-mate/localhost-gnome/' \ @@ -400,50 +400,50 @@ sed -i logrotate/x2gobroker-daemon \ -e 's/adm/root/' sed -i logrotate/x2gobroker-wsgi \ -e 's/adm/root/' -make %{?_smp_mflags} PREFIX="%_prefix" LIBDIR="%_libexecdir" +make %{?_smp_mflags} PREFIX="%{_prefix}" LIBDIR="%{_libexecdir}" %install -b="%buildroot" -make install PREFIX="%_prefix" LIBDIR="%_libexecdir" DESTDIR="$b" +b="%{buildroot}" +make install PREFIX="%{_prefix}" LIBDIR="%{_libexecdir}" DESTDIR="${b}" # # Somewhat distro specific (especially the paths), thus this was not # done in the shipped tarball's Makefile # %if 0%{?suse_version} -mkdir -p "$b/%_sysconfdir/apache2"/{conf.d,vhosts.d} -ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ - "$b/%_sysconfdir/apache2/conf.d/x2gobroker-wsgi.conf" -ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ - "$b/%_sysconfdir/apache2/vhosts.d/x2gobroker-wsgi.sample" +mkdir -p "${b}/%{_sysconfdir}/apache2"/{conf.d,vhosts.d} +ln -s "%{_sysconfdir}/x2go/x2gobroker-wsgi.apache.conf" \ + "${b}/%{_sysconfdir}/apache2/conf.d/x2gobroker-wsgi.conf" +ln -s "%{_sysconfdir}/x2go/x2gobroker-wsgi.apache.vhost" \ + "${b}/%{_sysconfdir}/apache2/vhosts.d/x2gobroker-wsgi.sample" %else -mkdir -p "$b/%_sysconfdir/httpd"/{conf.d,vhosts.d} -ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ - "$b/%_sysconfdir/httpd/conf.d/x2gobroker-wsgi.conf" -ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ - "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample" +mkdir -p "${b}/%{_sysconfdir}/httpd"/{conf.d,vhosts.d} +ln -s "%{_sysconfdir}/x2go/x2gobroker-wsgi.apache.conf" \ + "${b}/%{_sysconfdir}/httpd/conf.d/x2gobroker-wsgi.conf" +ln -s "%{_sysconfdir}/x2go/x2gobroker-wsgi.apache.vhost" \ + "${b}/%{_sysconfdir}/httpd/vhosts.d/x2gobroker-wsgi.sample" %endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 # System.d session cleanup script -mkdir -p %{buildroot}%{_unitdir} -install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir} -install -pm0644 x2gobroker-authservice.service %{buildroot}%{_unitdir} -install -pm0644 x2gobroker-loadchecker.service %{buildroot}%{_unitdir} -rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-daemon -rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-authservice -rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-loadchecker -rm -f %{buildroot}%{_sysconfdir}/default/python-x2gobroker +mkdir -p "%{buildroot}%{_unitdir}" +install -pm0644 'x2gobroker-daemon.service' "%{buildroot}%{_unitdir}" +install -pm0644 'x2gobroker-authservice.service' "%{buildroot}%{_unitdir}" +install -pm0644 'x2gobroker-loadchecker.service' "%{buildroot}%{_unitdir}" +rm -f "%{buildroot}%{_sysconfdir}/default/x2gobroker-daemon" +rm -f "%{buildroot}%{_sysconfdir}/default/x2gobroker-authservice" +rm -f "%{buildroot}%{_sysconfdir}/default/x2gobroker-loadchecker" +rm -f "%{buildroot}%{_sysconfdir}/default/python-x2gobroker" %else %if 0%{?el6} || ( 0%{?suse_version} && 0%{?suse_version} < 1140) -rm -f %{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf -mkdir -p "$b/%_initddir" -install -pm0755 %SOURCE3 \ - "$b/%_initddir/x2gobroker-loadchecker" -install -pm0755 %SOURCE2 \ - "$b/%_initddir/x2gobroker-authservice" -install -pm0755 %SOURCE1 \ - "$b/%_initddir/x2gobroker-daemon" +rm -f "%{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf" +mkdir -p "${b}/%{_initddir}" +install -pm0755 "%{SOURCE3}" \ + "${b}/%{_initddir}/x2gobroker-loadchecker" +install -pm0755 "%{SOURCE2}" \ + "${b}/%{_initddir}/x2gobroker-authservice" +install -pm0755 "%{SOURCE1}" \ + "${b}/%{_initddir}/x2gobroker-daemon" %endif %endif @@ -457,341 +457,341 @@ rm -f "%{buildroot}/%{_libexecdir}/tmpfiles.d/"*.conf # Totally distro-specific # %if 0%{?fdupes:1} -%fdupes %buildroot/%_prefix +%fdupes "%{buildroot}/%{_prefix}" %endif %pre -n python3-x2gobroker -if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then - /usr/sbin/useradd -c "X2Go Broker System User" \ - -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/bash x2gobroker || : +if ! /usr/bin/getent 'group' 'x2gobroker' 1>'/dev/null' 2>'/dev/null' && /usr/sbin/groupadd -r 'x2gobroker'; then + if ! /usr/bin/getent 'passwd' 'x2gobroker' 1>'/dev/null' 2>'/dev/null'; then + /usr/sbin/useradd -c 'X2Go Broker System User' \ + -d "%{_localstatedir}/lib/x2gobroker" \ + -g 'x2gobroker' -r -s '/bin/bash' 'x2gobroker' || : fi 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 +/sbin/chkconfig --add 'x2gobroker-authservice' if [ "$1" -ge "1" ] ; then - /sbin/service x2gobroker-authservice condrestart >/dev/null 2>&1 || : + /sbin/service 'x2gobroker-authservice' 'condrestart' >'/dev/null' 2>&1 || : 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 - /sbin/service x2gobroker-authservice stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gobroker-authservice + /sbin/service 'x2gobroker-authservice' 'stop' >'/dev/null' 2>&1 + /sbin/chkconfig --del 'x2gobroker-authservice' fi %endif %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 +/sbin/chkconfig --add 'x2gobroker-loadchecker' if [ "$1" -ge "1" ] ; then - /sbin/service x2gobroker-loadchecker condrestart >/dev/null 2>&1 || : + /sbin/service 'x2gobroker-loadchecker' 'condrestart' >'/dev/null' 2>&1 || : 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 - /sbin/service x2gobroker-loadchecker stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gobroker-loadchecker + /sbin/service 'x2gobroker-loadchecker' 'stop' >'/dev/null' 2>&1 + /sbin/chkconfig --del 'x2gobroker-loadchecker' fi %endif %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 +/sbin/chkconfig --add 'x2gobroker-daemon' if [ "$1" -ge "1" ] ; then - /sbin/service x2gobroker-daemon condrestart >/dev/null 2>&1 || : + /sbin/service 'x2gobroker-daemon' 'condrestart' >'/dev/null' 2>&1 || : 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 - /sbin/service x2gobroker-daemon stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gobroker-daemon + /sbin/service 'x2gobroker-daemon' 'stop' >'/dev/null' 2>&1 + /sbin/chkconfig --del 'x2gobroker-daemon' fi %endif %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 %post ssh -if ! /usr/bin/getent group x2gobroker-users 1>/dev/null 2>/dev/null; then - /usr/sbin/groupadd -r x2gobroker-users +if ! /usr/bin/getent 'group' 'x2gobroker-users' 1>'/dev/null' 2>'/dev/null'; then + /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 -if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - if ! /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null; then - /usr/sbin/useradd -c "X2Go Broker System User" \ - -d "%_localstatedir/lib/x2gobroker" \ - -g x2gobroker -r -s /bin/bash x2gobroker || : +if ! /usr/bin/getent 'group' 'x2gobroker' 1>'/dev/null' 2>'/dev/null' && /usr/sbin/groupadd -r 'x2gobroker'; then + if ! /usr/bin/getent 'passwd' 'x2gobroker' 1>'/dev/null' 2>'/dev/null'; then + /usr/sbin/useradd -c 'X2Go Broker System User' \ + -d "%{_localstatedir}/lib/x2gobroker" \ + -g 'x2gobroker' -r -s '/bin/bash' 'x2gobroker' || : fi 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 %files %defattr(-,root,root) -%_bindir/x2gobroker -%_bindir/x2gobroker-testauth -%_sbindir/x2gobroker-keygen -%_sbindir/x2gobroker-testagent -%_mandir/man1/x2gobroker*.1* -%exclude %_mandir/man1/x2gobroker-ssh.1* -%exclude %_mandir/man1/x2gobroker-daemon.1* -%_mandir/man8/x2gobroker-keygen.8* -%_mandir/man8/x2gobroker-testagent.8* +%{_bindir}/x2gobroker +%{_bindir}/x2gobroker-testauth +%{_sbindir}/x2gobroker-keygen +%{_sbindir}/x2gobroker-testagent +%{_mandir}/man1/x2gobroker*.1* +%{exclude} %{_mandir}/man1/x2gobroker-ssh.1* +%{exclude} %{_mandir}/man1/x2gobroker-daemon.1* +%{_mandir}/man8/x2gobroker-keygen.8* +%{_mandir}/man8/x2gobroker-testagent.8* %files -n python3-x2gobroker %defattr(-,root,root) -%config(noreplace) %_sysconfdir/x2go -%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf -%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost -%config %_sysconfdir/pam.d +%config(noreplace) %{_sysconfdir}/x2go +%{exclude} %{_sysconfdir}/x2go/x2gobroker-wsgi.apache.conf +%{exclude} %{_sysconfdir}/x2go/x2gobroker-wsgi.apache.vhost +%config %{_sysconfdir}/pam.d %if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140) -%config %_sysconfdir/default/python-x2gobroker +%config %{_sysconfdir}/default/python-x2gobroker %endif %python3_sitelib/x2gobroker* -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker +%attr(00750,x2gobroker,x2gobroker) %{_localstatedir}/lib/x2gobroker %files authservice %defattr(-,root,root) %if 0%{?el6} -%_initddir/x2gobroker-authservice +%{_initddir}/x2gobroker-authservice %endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-authservice.service %endif %if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140) -%config %_sysconfdir/default/x2gobroker-authservice +%config %{_sysconfdir}/default/x2gobroker-authservice %endif -%config %_sysconfdir/logrotate.d/x2gobroker-authservice -%_sbindir/x2gobroker-authservice -%_mandir/man8/x2gobroker-authservice.8* +%config %{_sysconfdir}/logrotate.d/x2gobroker-authservice +%{_sbindir}/x2gobroker-authservice +%{_mandir}/man8/x2gobroker-authservice.8* %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -%_libexecdir/tmpfiles.d/x2gobroker-authservice.conf +%{_libexecdir}/tmpfiles.d/x2gobroker-authservice.conf %endif -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker %files loadchecker %defattr(-,root,root) %if 0%{?el6} -%_initddir/x2gobroker-loadchecker +%{_initddir}/x2gobroker-loadchecker %endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-loadchecker.service %endif %if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140) -%config %_sysconfdir/default/x2gobroker-loadchecker +%config %{_sysconfdir}/default/x2gobroker-loadchecker %endif -%config %_sysconfdir/logrotate.d/x2gobroker-loadchecker -%_sbindir/x2gobroker-loadchecker -%_mandir/man8/x2gobroker-loadchecker.8* +%config %{_sysconfdir}/logrotate.d/x2gobroker-loadchecker +%{_sbindir}/x2gobroker-loadchecker +%{_mandir}/man8/x2gobroker-loadchecker.8* %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -%_libexecdir/tmpfiles.d/x2gobroker-loadchecker.conf +%{_libexecdir}/tmpfiles.d/x2gobroker-loadchecker.conf %endif -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker %files daemon %defattr(-,root,root) -%_bindir/x2gobroker-daemon +%{_bindir}/x2gobroker-daemon %if 0%{?el6} -%_initddir/x2gobroker-daemon +%{_initddir}/x2gobroker-daemon %endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-daemon.service %endif %if 0%{?el6} || (0%{?suse_version} && 0%{?suse_version} < 1140) -%config %_sysconfdir/default/x2gobroker-daemon +%config %{_sysconfdir}/default/x2gobroker-daemon %endif -%_sbindir/x2gobroker-daemon-debug -%_mandir/man1/x2gobroker-daemon.1* -%_mandir/man8/x2gobroker-daemon-debug.8* +%{_sbindir}/x2gobroker-daemon-debug +%{_mandir}/man1/x2gobroker-daemon.1* +%{_mandir}/man8/x2gobroker-daemon-debug.8* %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -%_libexecdir/tmpfiles.d/x2gobroker-daemon.conf +%{_libexecdir}/tmpfiles.d/x2gobroker-daemon.conf %endif -%config %_sysconfdir/logrotate.d/x2gobroker-daemon -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker +%config %{_sysconfdir}/logrotate.d/x2gobroker-daemon +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker %files ssh %defattr(-,root,root) -%attr(04550,x2gobroker,x2gobroker-users) %_bindir/x2gobroker-ssh -%_mandir/man1/x2gobroker-ssh.1* -%_sysconfdir/sudoers.d/x2gobroker-ssh +%attr(04550,x2gobroker,x2gobroker-users) %{_bindir}/x2gobroker-ssh +%{_mandir}/man1/x2gobroker-ssh.1* +%{_sysconfdir}/sudoers.d/x2gobroker-ssh %files wsgi %defattr(-,root,root) %if 0%{?suse_version} -%_sysconfdir/apache2 +%{_sysconfdir}/apache2 %else -%_sysconfdir/httpd +%{_sysconfdir}/httpd %endif -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -%config %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf -%config %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost -%config %_sysconfdir/logrotate.d/x2gobroker-wsgi +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker +%config %{_sysconfdir}/x2go/x2gobroker-wsgi.apache.conf +%config %{_sysconfdir}/x2go/x2gobroker-wsgi.apache.vhost +%config %{_sysconfdir}/logrotate.d/x2gobroker-wsgi %files agent %defattr(-,root,root) -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker -%dir %_libexecdir/x2go -%attr(04750,root,x2gobroker) %_libexecdir/x2go/x2gobroker-agent -%_libexecdir/x2go/x2gobroker-agent.pl -%_sbindir/x2gobroker-pubkeyauthorizer -%_mandir/man8/x2gobroker-pubkeyauthorizer.8* +%attr(02750,x2gobroker,x2gobroker) %{_localstatedir}/log/x2gobroker +%attr(00750,x2gobroker,x2gobroker) %{_localstatedir}/lib/x2gobroker +%dir %{_libexecdir}/x2go +%attr(04750,root,x2gobroker) %{_libexecdir}/x2go/x2gobroker-agent +%{_libexecdir}/x2go/x2gobroker-agent.pl +%{_sbindir}/x2gobroker-pubkeyauthorizer +%{_mandir}/man8/x2gobroker-pubkeyauthorizer.8* %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git