Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Makefile, build file and elog.spec for new RH7 on elog.psi.ch

Browse Source
This commit is contained in:
Stefan Ritt 2018-09-26 13:19:49 +02:00
parent 966e3ddca9
commit a04faf9fa9
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -20,6 +20,7 @@ ELOGDIR = $(ROOT)$(PREFIX)/elog
DESTDIR = $(ROOT)$(PREFIX)/bin DESTDIR = $(ROOT)$(PREFIX)/bin
SDESTDIR = $(ROOT)$(PREFIX)/sbin SDESTDIR = $(ROOT)$(PREFIX)/sbin
RCDIR = $(ROOT)/etc/rc.d/init.d RCDIR = $(ROOT)/etc/rc.d/init.d
SRVDIR = $(ROOT)/usr/lib/systemd/system
# flag for SSL support # flag for SSL support
USE_SSL = 1 USE_SSL = 1
@ -207,21 +208,23 @@ install: $(EXECS)
fi fi
ifneq ("$(wildcard /usr/lib/systemd/system)", "") ifneq ($(OSTYPE),darwin)
@$(INSTALL) -v -m 0644 elogd.service /usr/lib/systemd/system
@echo The elogd service can now be started with
@echo " sudo systemctl start elogd"
else
ifeq ($(OSTYPE),darwin)
@$(INSTALL) -v -m 0644 elogd.plist /Library/LaunchDaemons/ch.psi.elogd.plist
@echo The elogd service can now be started with
@echo " sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
else
@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init @sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
@if [ ! -f $(RCDIR)/elogd ]; then \ @if [ ! -f $(RCDIR)/elogd ]; then \
$(INSTALL) -v -m 0755 -D elogd.init $(RCDIR)/elogd ; \ $(INSTALL) -v -m 0755 -D elogd.init $(RCDIR)/elogd ; \
fi fi
endif endif
ifneq ("$(wildcard $(SRVDIR))", "")
@$(INSTALL) -v -m 0644 -D elogd.service $(SRVDIR)
@echo The elogd service can now be started with
@echo " sudo systemctl start elogd"
endif
ifeq ($(OSTYPE),darwin)
@$(INSTALL) -v -m 0644 elogd.plist /Library/LaunchDaemons/ch.psi.elogd.plist
@echo The elogd service can now be started with
@echo " sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
endif endif
restart: restart:

17
build
View File

@ -45,6 +45,7 @@ cp -p COPYING $dir
cp -p README $dir cp -p README $dir
cp -p elogd.init_template $dir cp -p elogd.init_template $dir
cp -p elogd.plist $dir cp -p elogd.plist $dir
cp -p elogd.service $dir
cp -p doc/* $dir/doc cp -p doc/* $dir/doc
cp -p man/* $dir/man cp -p man/* $dir/man
@ -60,7 +61,7 @@ cp -p logbooks/demo/2001/011108a.log $dir/logbooks/demo/2001/
# create elog-x.xx.tar.gz file # create elog-x.xx.tar.gz file
echo Creating archive... echo Creating archive...
cd /tmp cd /tmp
tar -cvzf $archive elog-$version/ mxml/ tar -cvzf $archive elog-$version/
# remove temporary files # remove temporary files
rm -Rf $dir rm -Rf $dir
@ -68,19 +69,19 @@ rm -Rf $dir
# transfer archive # transfer archive
cp /tmp/$archive ~ritt/html/elog/download/tar/ cp /tmp/$archive ~ritt/html/elog/download/tar/
cp /tmp/$archive ~ritt/html/elog/download/tar/elog-latest.tar.gz cp /tmp/$archive ~ritt/html/elog/download/tar/elog-latest.tar.gz
cp /tmp/$archive /usr/src/redhat/SOURCES/elog-$version.tar.gz cp /tmp/$archive ~/rpmbuild/SOURCES/elog-$version.tar.gz
cd ~ritt/elog cd ~ritt/elog
cp -f doc/ChangeLog ~ritt/html/elog/download/ChangeLog cp -f doc/ChangeLog ~ritt/html/elog/download/ChangeLog
rm -f /tmp/$archive rm -f /tmp/$archive
# building RPMs # building RPMs
rm -f /usr/src/redhat/RPMS/i386/* rm -f ~rpmbuild/RPMS/x86_64/*
rm -f /usr/src/redhat/SRPMS/* rm -f ~rpmbuild/SRPMS/*
rpmbuild -ba elog.spec || exit $? rpmbuild -ba elog.spec || exit $?
cp /usr/src/redhat/RPMS/i386/elog*rpm ~ritt/html/elog/download/RPMS/ cp ~/rpmbuild/RPMS/x86_64/elog*rpm ~ritt/html/elog/download/RPMS/
cp /usr/src/redhat/RPMS/i386/elog-$version-$release.i386.rpm ~ritt/html/elog/download/RPMS/elog-latest.i386.rpm cp ~/rpmbuild/RPMS/x86_64/elog-$version-$release.x86_64.rpm ~ritt/html/elog/download/RPMS/elog-latest.x86_64.rpm
cp /usr/src/redhat/SRPMS/elog*rpm ~ritt/html/elog/download/SRPMS/ cp ~/rpmbuild/SRPMS/elog*rpm ~ritt/html/elog/download/SRPMS/
cp /usr/src/redhat/SRPMS/elog-$version-$release.src.rpm ~ritt/html/elog/download/SRPMS/elog-latest.src.rpm cp ~/rpmbuild/SRPMS/elog-$version-$release.src.rpm ~ritt/html/elog/download/SRPMS/elog-latest.src.rpm

6
elog.spec
View File

@ -2,7 +2,7 @@
Name: elog Name: elog
Summary: elog is a standalone electronic web logbook Summary: elog is a standalone electronic web logbook
Version: 3.1.3 Version: 3.1.4
Release: 1 Release: 1
License: GPL License: GPL
Group: Applications/Networking Group: Applications/Networking
@ -41,9 +41,11 @@ access control, etc. Moreover, a single server can host several weblogs, and
each weblog can be totally different from the rest. each weblog can be totally different from the rest.
%changelog %changelog
* Wed Sep 26 2018 Stefan Ritt <stefan.ritt@psi.ch>
- Made adjustments for new elog server and RH7
* Fri Aug 29 2014 Stefan Ritt <stefan.ritt@psi.ch> * Fri Aug 29 2014 Stefan Ritt <stefan.ritt@psi.ch>
- Added BuildRequires, thanks to Stefan Roiser from CERN - Added BuildRequires, thanks to Stefan Roiser from CERN
* Fri Oct 24 2005 Stefan Ritt <stefan.ritt@psi.ch> * Fri Oct 21 2005 Stefan Ritt <stefan.ritt@psi.ch>
- Added resources/ directory - Added resources/ directory
* Fri Mar 14 2003 Stefan Ritt <stefan.ritt@psi.ch> * Fri Mar 14 2003 Stefan Ritt <stefan.ritt@psi.ch>
- Added %post to change ownership of elog files - Added %post to change ownership of elog files