This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goadmincenter. from 4b4784f Add Estonian translation files. new 42d343b Adapt to building on openSUSE/SLES. 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: debian/changelog | 1 + x2goadmincenter.spec | 42 ++++++++++++++++++++++++++++++++++--- x2goadmincenter/Makefile.man2html | 10 +++++---- x2goadminserver/Makefile.man2html | 10 +++++---- 4 files changed, 52 insertions(+), 11 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 42d343ba43ae6d19749fb40953ce0915d25fbd86 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 09:46:58 2014 +0200 Adapt to building on openSUSE/SLES. --- debian/changelog | 1 + x2goadmincenter.spec | 42 ++++++++++++++++++++++++++++++++++--- x2goadmincenter/Makefile.man2html | 10 +++++---- x2goadminserver/Makefile.man2html | 10 +++++---- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 339fef5..5b85a20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low Poplawski!!!) + Add man / man2html-core to BR. + EPEL-7 build-requires man2html-core rather than man. + + Adapt to building on openSUSE/SLES. [ Martti Pitkanen ] * Upstream version 0.0.0.1 (initial release): diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index b1deabf..40c5c27 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -3,17 +3,35 @@ Version: 0.0.0.1 Release: 0.0x2go1%{?dist} Summary: X2Go Administration Center (Qt4 client) +%if 0%{?suse_version} +Group: Production/Network/Remote Desktop +License: AGPL-3.0+ +%else Group: Applications/System -License: GPLv2+ +License: AGPLv3+ +%endif URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils +%if 0%{?suse_version} +BuildRequires: libqt4-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: libqt4-linguist +%endif +%else +%if 0%{?el5} || 0%{?el6} BuildRequires: qt4-devel -%if 0%{?fedora} || 0%{?el7} -BuildRequires: man2html-core %else +BuildRequires: qt-devel +%endif +%endif +%if 0%{?fedora} || 0%{?rhel} +%if 0%{?el6} BuildRequires: man +%else +BuildRequires: man2html-core +%endif %endif Requires: hicolor-icon-theme @@ -68,6 +86,10 @@ sed -i x2goadminserver/Makefile -e '/^CGIBINDIR=/s,/lib/,/%{_lib}/,' sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' x2goadmincenter/Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' x2goadmincenter/Makefile %endif +%if 0%{?suse_version} +sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_bindir}/qmake@' x2goadmincenter/Makefile +sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_bindir}/lrelease@' x2goadmincenter/Makefile +%endif make %{?_smp_mflags} @@ -90,22 +112,36 @@ fi %files +%defattr(-,root,root) %doc debian/changelog %doc debian/copyright %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ +%{_datadir}/%{name}/ +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/128x128 +%dir %{_datadir}/icons/hicolor/128x128/apps +%dir %{_datadir}/icons/hicolor/16x16 +%dir %{_datadir}/icons/hicolor/16x16/apps +%dir %{_datadir}/icons/hicolor/32x32 +%dir %{_datadir}/icons/hicolor/32x32/apps +%dir %{_datadir}/icons/hicolor/64x64 +%dir %{_datadir}/icons/hicolor/64x64/apps %{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/64x64/apps/%{name}.png +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/ %{_mandir}/man8/%{name}.8.gz %files -n x2goadminserver +%defattr(-,root,root) %{_sysconfdir}/x2go/x2goadminserver.conf +%dir %{_libdir}/x2go/ %{_libdir}/x2go/ %{_libdir}/cgi-bin/ %{_mandir}/man5/x2go*.5.gz diff --git a/x2goadmincenter/Makefile.man2html b/x2goadmincenter/Makefile.man2html index f7401de..3412768 100644 --- a/x2goadmincenter/Makefile.man2html +++ b/x2goadmincenter/Makefile.man2html @@ -1,6 +1,6 @@ #!/usr/bin/make -f -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man BUILD_DIR = .build_man2html MAN2HTML_DEST = $(BUILD_DIR)/html @@ -12,9 +12,11 @@ all: build build: build_man2html build_man2html: - mkdir -p $(MAN2HTML_DEST) - for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + if [ -n "$(MAN2HTML_BIN)" ]; then \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + fi clean: clean_man2html diff --git a/x2goadminserver/Makefile.man2html b/x2goadminserver/Makefile.man2html index f7401de..3412768 100644 --- a/x2goadminserver/Makefile.man2html +++ b/x2goadminserver/Makefile.man2html @@ -1,6 +1,6 @@ #!/usr/bin/make -f -MAN2HTML_BIN = man2html +MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man BUILD_DIR = .build_man2html MAN2HTML_DEST = $(BUILD_DIR)/html @@ -12,9 +12,11 @@ all: build build: build_man2html build_man2html: - mkdir -p $(MAN2HTML_DEST) - for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + if [ -n "$(MAN2HTML_BIN)" ]; then \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + fi clean: clean_man2html -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goadmincenter.git
-
git-admin＠x2go.org