From aded4ae08cacede0af5e8ff2f5fee7acf2e5750b Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Fri, 21 Apr 2017 11:00:25 +0200
Subject: [PATCH] Fixed build file with new mxml subdirectory

---
 build      | 8 +++-----
 elog.spec  | 2 +-
 elogd.init | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build b/build
index 164c5674..7d57ca76 100755
--- a/build
+++ b/build
@@ -15,11 +15,11 @@ set archive = elog-$version-$release.tar.gz
 perl -wapi.bak -e 's&^(Version:\s+).*$&${1}'"${version}"'&;s&^(Release:\s+).*$&${1}'"${release}"'&;' elog.spec
 
 # create temporary directory
-rm -Rf $dir/../mxml
 rm -Rf $dir
 mkdir $dir
 mkdir $dir/doc
 mkdir $dir/src
+mkdir $dir/mxml
 mkdir $dir/man
 mkdir $dir/contrib
 mkdir $dir/scripts
@@ -32,14 +32,13 @@ mkdir $dir/themes/default/icons
 mkdir $dir/logbooks/
 mkdir $dir/logbooks/demo
 mkdir $dir/logbooks/demo/2001
-mkdir $dir/../mxml
 
 # copy files to archive
 unalias cp
 cp -p src/*.c $dir/src
 cp -p src/*.h $dir/src
-cp -p ../mxml/*.c $dir/../mxml
-cp -p ../mxml/*.h $dir/../mxml
+cp -p mxml/*.c $dir/mxml
+cp -p mxml/*.h $dir/mxml
 cp -p Makefile $dir
 cp -p elogd.cfg $dir/elogd.cfg
 cp -p COPYING $dir
@@ -64,7 +63,6 @@ cd /tmp
 tar -cvzf $archive elog-$version/ mxml/
 
 # remove temporary files
-rm -Rf $dir/../mxml
 rm -Rf $dir
 
 # transfer archive
diff --git a/elog.spec b/elog.spec
index 244511da..93bfbbaa 100755
--- a/elog.spec
+++ b/elog.spec
@@ -2,7 +2,7 @@
 
 Name:       elog
 Summary:    elog is a standalone electronic web logbook
-Version:    3.1.0
+Version:    3.1.3
 Release:    1
 License:    GPL
 Group:      Applications/Networking
diff --git a/elogd.init b/elogd.init
index 8982b4b1..5d4e7ee5 100644
--- a/elogd.init
+++ b/elogd.init
@@ -30,12 +30,12 @@ case "$1" in
 	echo -n "Starting elogd: "
 	/usr/local/sbin/elogd -D -c /usr/local/elog/elogd.cfg  > /dev/null 2>&1 
 	RETVAL=$?
-	if [ $RETVAL -eq 0  ] ; then 
-	  touch /var/lock/subsys/elogd
+        if [ $RETVAL -eq 0  ] ; then 
+          touch /var/lock/subsys/elogd
 	  echo_success
 	else
 	  echo_failure
-	fi
+        fi
 	echo
 	;;
   stop)