[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-15-g1061630
X2Go dev team
git-admin at x2go.org
Fri Dec 6 15:43:06 CET 2013
The branch, master has been updated
via 1061630f1cc0e65914353bfc18f9461338ef318c (commit)
from 523d50529ee75703254084dca26ef016e54d299a (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 1061630f1cc0e65914353bfc18f9461338ef318c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Dec 6 15:42:26 2013 +0100
adapt spec file to last commit
-----------------------------------------------------------------------
Summary of changes:
nx-libs.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/nx-libs.spec b/nx-libs.spec
index 86a3459..07e2ba5 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -490,6 +490,12 @@ cp -v debian/Makefile.nx-libs Makefile
cp -v debian/Makefile.replace.sh replace.sh
cp -v debian/rgb rgb
cp -v debian/VERSION.x2goagent VERSION.x2goagent
+# remove bundled libraries (also taken from roll-tarball.sh)
+rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib}
+rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib}
+rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu}
+# remove build cruft that is in Git (also taken from roll-tarball.sh)
+rm -Rf nx*/configure nx*/autom4te.cache*
# Install into /usr
sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
# Use rpm optflags
@@ -514,7 +520,6 @@ find -type f -name '*.[hc]' | xargs chmod -x
# Xcursor - Other code still references files in it
# Xfont - Statically linked to nxarget, others?
# Xpm
-rm -r nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu}
%build
hooks/post-receive
--
nx-libs.git (NX (redistributed))
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 "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list