Fixed build file with new mxml subdirectory

This commit is contained in:
2017-04-21 11:00:25 +02:00
parent fd7f1e282b
commit aded4ae08c
3 changed files with 7 additions and 9 deletions
+3 -5
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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)