[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-12-ge3da345

X2Go dev team git-admin at x2go.org
Fri Dec 6 15:07:24 CET 2013


The branch, master has been updated
       via  e3da34510db9158362be60887bf354cb6a0bfe26 (commit)
      from  21cde6e426e4d5ba575035c57f493ee336eb18be (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 e3da34510db9158362be60887bf354cb6a0bfe26
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 6 15:06:42 2013 +0100

    prep source tree after unpacking tarball, bring files from debian/ folder in place before building the RPM package

-----------------------------------------------------------------------

Summary of changes:
 nx-libs.spec |   10 ++++++++++
 1 file changed, 10 insertions(+)

The diff of changes is:
diff --git a/nx-libs.spec b/nx-libs.spec
index e28e773..86a3459 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -480,6 +480,16 @@ information on NX.
 
 %prep
 %setup -q
+# copy files from the debian/ folder to designated places in the source tree,
+# taken from roll-tarball.sh:
+mkdir bin/
+cp -v debian/wrappers/* bin/
+mkdir etc/
+cp -v debian/keystrokes.cfg etc/keystrokes.cfg
+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
 # Install into /usr
 sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
 # Use rpm optflags


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