The branch, master has been updated via 68b59d548eab7045eabb3c4e55691f103e15677f (commit) from 2c55aae3bd6e4fa6ce0c5715afaf2a2c664705c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68b59d548eab7045eabb3c4e55691f103e15677f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 11 10:05:45 2013 +0100 x2goadmincenter.spec: patch LIBDIR in Makefiles ----------------------------------------------------------------------- Summary of changes: Makefile | 24 ++++++++++++------------ x2goadmincenter.spec | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index ccb1261..fddc551 100755 --- a/Makefile +++ b/Makefile @@ -6,25 +6,25 @@ build: build-arch build-indep # make man2html build available from project's base folder... build_man2html: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ clean: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ build-arch: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ build-indep: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ install: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ uninstall: - cd x2goadmincenter && make $@ - cd x2goadminserver && make $@ + cd x2goadmincenter && $(MAKE) $@ + cd x2goadminserver && $(MAKE) $@ diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index 377be2f..ccfa17e 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -60,6 +60,7 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org # Fix up install issues sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile sed -i -e 's/-o root -g root//' x2goadminserver/Makefile +find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' %build %if 0%{?el5} hooks/post-receive -- x2goadmincenter.git (X2Go Administration Center) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goadmincenter.git" (X2Go Administration Center).