On 12/12/2012 04:17 AM, Mike Gabriel wrote:
Hi Orion,
On Mi 12 Dez 2012 00:11:02 CET Orion Poplawski wrote:
I'm looking at packaging x2go for Fedora and am running into a few issues which I'm hoping to get resolved.
nx-libs: partially addresses that.
- bin/Makefile doesn't support DESTDIR. The attached nx-libs-destdir.patch
The various nx*/configure.in files do not honor passed in compiler flags. The attached nx-libs-optflags.patch fixes that. Note also though that CFLAGS is used in some and CPPFLAGS in others.
Is there a preferred way to install into /usr rather than /usr/local? I ended up doing: sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
It would be very nice if you could support installing into /usr/lib64. I had to do the following:
sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
make install ... USRLIBDIR=/usr/lib64/nx SHLIBDIR=/usr/lib64/nx
# Make sure x2goagent is linked relative and on 64-bit rm -rf %{buildroot}%{_prefix}/lib/x2go mkdir -p %{buildroot}%{_libdir}/x2go/bin ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent
Can you break this down to a patch against the current nx-libs.git on http://git.x2go.org? If yes, then we will apply that patch (after testing it).
Please note that Jan Engelhard already contributed a patch that addresses flexibility with choosing custom install locations. This patch is found in X2Go Server: http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=75798658a1934df1...
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=1fe04071bb1b318d...
Please base your work on that latest change of code. Also: if possible, only send patches against our code in Git.
Looking at current git it looks like bin/Makefile does not get created at all in the release tarball - removed by git commit:
commit d139e5d3da1b56457d7f076581de7e186fe2e6f2 Author: Reinhard Tartler <siretart@tauware.de> Date: Wed Dec 12 12:45:41 2012 +0100
drop debian/patches/001_add-main-makefile.full+lite.patch
Instead, place the makefile into debian/Makefile.nx-libs. This makes the
makefile easier to edit.Would be nice to still have these installed as part of the build process.
x2goserver:
- Does not honor passed in CFLAGS. The attached x2goserver-cflags.patch fixes.
- Again, very hard to use /usr/lib64...
I have forwarded the patch to X2Go BTS [1]. Please read [2] before sending more patches. Please use X2Go BTS for reporting bugs, sending patches.
[1] http://bugs.x2go.org/83 [2] http://bugs.x2go.org/Reporting.html
Thanks, will do.
x2goclient: prefix on Fedora, and in general that should be specified by -I...
- Required the attached x2goclient-include.patch to build. There is no qt4
Already in Vcs: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=1412f5a6d4031ef1...
Ah, will start to check git.
Thank you very much for your responsiveness!
-- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com