[X2Go-Commits] [x2goclient] 01/01: Copy ChangeLog.gitlog (if present) into txt/ subfolder during %setup.

git-admin at x2go.org git-admin at x2go.org
Tue Mar 4 09:45:51 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 571584d0be80f83095bbb001c1c1e87fda8bd5dc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 4 09:45:28 2014 +0100

    Copy ChangeLog.gitlog (if present) into txt/ subfolder during %setup.
---
 debian/changelog |    1 +
 x2goclient.spec  |    1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8980bab..602b54e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low
   * x2goclient.spec:
     + Copy ChangeLog (or debian/changelog) into txt/ subfolder during
       %setup.
+    + Copy ChangeLog.gitlog (if present) into txt/ subfolder during %setup.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 Jan 2014 09:20:08 +0100
 
diff --git a/x2goclient.spec b/x2goclient.spec
index 79820f4..5ac6e30 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -96,6 +96,7 @@ the X2Go Plugin via an Apache webserver.
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
 test -f ChangeLog && cp ChangeLog txt/changelog || test -f debian/changelog && cp debian/changelog txt/changelog || true
+test -f ChangeLog.gitlog && cp ChangeLog.gitlog txt/git-info || true
 %if 0%{?el5}
 sed -i -e '/^QMAKE_BINARY=/s at qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile
 sed -i -e '/^LRELEASE_BINARY=/s at lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git



More information about the x2go-commits mailing list