diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-06 15:42:26 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-06 15:42:26 +0100 |
| commit | 1061630f1cc0e65914353bfc18f9461338ef318c (patch) | |
| tree | 621f8b0d1ffcd3673407c8f5645c0761c916614a | |
| parent | 523d50529ee75703254084dca26ef016e54d299a (diff) | |
| download | nx-libs-1061630f1cc0e65914353bfc18f9461338ef318c.tar.gz nx-libs-1061630f1cc0e65914353bfc18f9461338ef318c.tar.bz2 nx-libs-1061630f1cc0e65914353bfc18f9461338ef318c.zip | |
adapt spec file to last commit
| -rw-r--r-- | nx-libs.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 86a345937..07e2ba5c9 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 |