This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit c26642c1e8faf6145162ba7465ccada6fc5a2656 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 24 13:03:23 2014 +0100 Builds for EPEL-7 also have to systemd aware. --- debian/changelog | 1 + x2gobroker.spec | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97f6bb4..63dce8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -107,6 +107,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low + Install Apache2 config symlinks to /etc/httpd (not /etc/apache2). + Make sure x2gobroker-agent wrapper gets installed into x2gobroker-agent sub-package. + + Builds for EPEL-7 also have to systemd aware. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/x2gobroker.spec b/x2gobroker.spec index c1e2ec8..91fd657 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python2-devel BuildRequires: python-setuptools -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} BuildRequires: systemd %endif Requires: logrotate @@ -251,7 +251,7 @@ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample" -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} # System.d session cleanup script mkdir -p %{buildroot}%{_unitdir} install -pm0644 x2gobroker-daemon.service %{buildroot}%{_unitdir} @@ -290,7 +290,7 @@ fi; %post authservice -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %systemd_post x2gobroker-authservice.service %else /sbin/chkconfig --add x2gobroker-authservice @@ -300,7 +300,7 @@ fi %endif %preun authservice -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %systemd_preun x2gobroker-authservice.service %else if [ "$1" = 0 ]; then @@ -309,14 +309,14 @@ if [ "$1" = 0 ]; then fi %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %postun authservice %systemd_postun x2gobroker-authservice.service %endif %post daemon -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %systemd_post x2gobroker-daemon.service %else /sbin/chkconfig --add x2gobroker-daemon @@ -326,7 +326,7 @@ fi %endif %preun daemon -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %systemd_preun x2gobroker-daemon.service %else if [ "$1" = 0 ]; then @@ -335,7 +335,7 @@ if [ "$1" = 0 ]; then fi %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} %postun daemon %systemd_postun x2gobroker-daemon.service %endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git