This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2475a938269945f8746235c5dd70427f70c9a078 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 05:53:33 2019 +0200 x2goserver.spec: pass down LIBDIR via make calls, not by modifying all source files with sed. --- debian/changelog | 2 ++ x2goserver.spec | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 890748b..4877796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium + Install new x2goisint wrapper. + Install section 1 man pages. + Exclude x2goagent man page from x2goserver package. + + Pass down LIBDIR via make calls, not by modifying all source files with + sed. * debian/x2goserver.install: + Install bin/x2goupdateoptionsstring. diff --git a/x2goserver.spec b/x2goserver.spec index ec20ad5..98c0ce6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -615,18 +615,15 @@ false-positives when running X2Go sessions. %prep %setup -q -# Set path -find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' -sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile %build -make %{?_smp_mflags} CFLAGS="%{?__global_cppflags} %{?__global_cflags} %{optflags}" LDFLAGS="%{?__global_ldflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +make %{?_smp_mflags} CFLAGS='%{?__global_cppflags} %{?__global_cflags} %{optflags}' LDFLAGS='%{?__global_ldflags}' PERL_INSTALLDIRS='vendor' PREFIX='%{_prefix}' NXLIBDIR='%{_libdir}/nx' LIBDIR='%{_libdir}/x2go' %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +make install DESTDIR='%{buildroot}' PREFIX='%{_prefix}' NXLIBDIR='%{_libdir}/nx' LIBDIR='%{_libdir}/x2go' # Make sure the .packlist file is removed from %%{perl_vendorarch}... find %{buildroot}%{perl_vendorarch} -name .packlist | while read file; do rm -f "$file"; done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git