From 6ae0c8a97407656edcf0afacd1d003ffa78f6e7f Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Wed, 12 Feb 2020 12:36:51 +0100 Subject: [PATCH] Updated buildrpm --- buildrpm | 13 ++++++------- elog.spec | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildrpm b/buildrpm index 90aac7a8..9d21f4a1 100755 --- a/buildrpm +++ b/buildrpm @@ -40,7 +40,7 @@ cp -p src/*.h $dir/src 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 elogd.cfg.example $dir/elogd.cfg.example cp -p COPYING $dir cp -p README $dir cp -p elogd.init_template $dir @@ -61,12 +61,13 @@ cp -p logbooks/demo/2001/011108a.log $dir/logbooks/demo/2001/ # create elog-x.xx.tar.gz file echo Creating archive... cd /tmp -tar -cvzf $archive elog-$version/ +tar -czf $archive elog-$version/ # remove temporary files rm -Rf $dir # transfer archive +echo Transfer archive... cp /tmp/$archive ~ritt/html/elog/download/tar/ cp /tmp/$archive ~ritt/html/elog/download/tar/elog-latest.tar.gz cp /tmp/$archive ~/rpmbuild/SOURCES/elog-$version.tar.gz @@ -75,13 +76,11 @@ cp -f doc/ChangeLog ~ritt/html/elog/download/ChangeLog rm -f /tmp/$archive # building RPMs -rm -f ~rpmbuild/RPMS/x86_64/* -rm -f ~rpmbuild/SRPMS/* +echo Build RPMs... +rm -f ~/rpmbuild/RPMS/x86_64/* +rm -f ~/rpmbuild/SRPMS/* rpmbuild -ba elog.spec || exit $? cp ~/rpmbuild/RPMS/x86_64/elog*rpm ~ritt/html/elog/download/RPMS/ cp ~/rpmbuild/RPMS/x86_64/elog-$version-$release.x86_64.rpm ~ritt/html/elog/download/RPMS/elog-latest.x86_64.rpm cp ~/rpmbuild/SRPMS/elog*rpm ~ritt/html/elog/download/SRPMS/ cp ~/rpmbuild/SRPMS/elog-$version-$release.src.rpm ~ritt/html/elog/download/SRPMS/elog-latest.src.rpm - - - diff --git a/elog.spec b/elog.spec index ad8fd8af..16add8f6 100755 --- a/elog.spec +++ b/elog.spec @@ -3,7 +3,7 @@ Name: elog Summary: elog is a standalone electronic web logbook Version: 3.1.4 -Release: 1 +Release: 2 License: GPL Group: Applications/Networking Source: http://elog.psi.ch/elog/download/elog-%{version}.tar.gz