This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goadmincenter. from 08f01da Makefile: add dummy command for empty rule build-arch (maybe fixes FTBFS against EPEL-7) new 767bca3 Revert "Makefile: add dummy command for empty rule build-arch (maybe fixes FTBFS against EPEL-7)" new 7c12d66 EPEL-7 build-requires man2html-core rather than man. The 2 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: debian/changelog | 1 + x2goadmincenter.spec | 2 +- x2goadminserver/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 767bca33a4d8d07cb80e4a29270868b567a1a63b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 11 19:36:32 2014 +0100 Revert "Makefile: add dummy command for empty rule build-arch (maybe fixes FTBFS against EPEL-7)" This reverts commit 08f01da36f22518f86b6b005fa705ca65193aa7e. --- x2goadminserver/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index 171becd..bfa152a 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -23,7 +23,6 @@ all: build build: build-arch build-indep build-arch: - echo "Nothing to be done for build-arch..." build-indep: build_man -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goadmincenter. commit 7c12d66c676550d5d8f389e74acd3f0ec355de02 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 11 19:37:35 2014 +0100 EPEL-7 build-requires man2html-core rather than man. --- debian/changelog | 1 + x2goadmincenter.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 85fe782..c40d24f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low x2godesktopsharing.spec and x2goclient.spec. (Thanks to Orion Poplawski!!!) + Add man / man2html-core to BR. + + EPEL-7 build-requires man2html-core rather than man. [ Oleksandr Shneyder ] * Upstream version 0.0.0.1 (initial release): diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index a0af650..b1deabf 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -10,7 +10,7 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. BuildRequires: desktop-file-utils BuildRequires: qt4-devel -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?el7} BuildRequires: man2html-core %else BuildRequires: man -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
-
git-admin＠x2go.org