This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from bb4b69e debian/control: Typo fix... missing ',' at EOL in Build-Depends: field. new 1ca6622 x2gobroker.spec: Let's try to get unit tests working on Fedora first... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile.docupload | 20 +++++++++----------- x2gobroker.spec | 6 +++++- 2 files changed, 14 insertions(+), 12 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 1ca66223c34075935897d4bd223919a8e6a95637 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 20:23:47 2018 +0200 x2gobroker.spec: Let's try to get unit tests working on Fedora first... --- Makefile.docupload | 20 +++++++++----------- x2gobroker.spec | 6 +++++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index f1c0f4a..e729c68 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -9,17 +9,15 @@ DOC_USER=x2go-admin doc: docbuild docupload -docbuild: - mkdir -p $(CURDIR)/.epydoc/html - #mkdir -p .epydoc/pdf - #mkdir -p .epydoc/pdf.tmp - rm -Rf .epydoc/html/* - epydoc --debug -n "Python X2Go Broker" -u http://www.x2go.org -v --html --no-private -o $(CURDIR)/.epydoc/html $(CURDIR)/x2gobroker/ - #epydoc --debug --pdf --no-private -o .epydoc/pdf.tmp x2go/ - #mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2Go_API.pdf - #rm -Rf .epydoc/pdf.tmp +clean: + ${MAKE} -C docs/ clean +docbuild: clean + ${MAKE} -C docs/ html SPHINXOPTS="-a -E" -docupload: +docupdate: + ${MAKE} -C docs/ html + +docupload: clean docbuild ssh -l${DOC_USER} ${DOC_HOST} rm -Rfv ${DOC_PATH}/* - scp -r .epydoc/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ + scp -r docs/build/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ diff --git a/x2gobroker.spec b/x2gobroker.spec index ad568bc..3ca617b 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -33,7 +33,8 @@ BuildRequires: fdupes %endif BuildRequires: sudo -# for unit tests... +%if 0%{?fedora} +# for unit tests, only test on Fedora for now, as the others lack (some of) those modules... %if 0%{?suse_version} BuildRequires: python3-pampy %else @@ -44,6 +45,7 @@ BuildRequires: python3-tornado BuildRequires: python3-paramiko BuildRequires: python3-daemon BuildRequires: python3-lockfile +%endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 BuildRequires: systemd @@ -374,8 +376,10 @@ installed on your to-be-managed X2Go servers. %prep %setup -q +%if 0%{?fedora} %check python3 test.py +%endif %build echo "Files where we will be patching libexecedir:" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org