This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit f6a40a3fbdc340c81c59cec983dbea379fe5e3c3 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Mon Jun 29 14:14:17 2015 +0200 updated spec file from rules --- debian/rules | 3 ++- redhat/mum.spec | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index ad8c683..4bf7fa7 100755 --- a/debian/rules +++ b/debian/rules @@ -68,11 +68,12 @@ install : build clean $(app) $(bower_components) $(static) $(views) $(install_sc cp $(in_venv) $(DEST_APP) cp $(mum_conf) $(DEST_CONF) cp $(mum_service) $(DEST_SYSTEMD) - cp $(readme) $(DEST_APP) + cp $(readme) $(DEST_DOC) cp $(requirements) $(DEST_APP) cp $(run) $(DEST_APP) cp $(mum_daemon) $(DEST_DOC) ln -s /usr/lib/mum/mum.sh -t $(DEST_BIN) + mv $(DEST_BIN)/mum.sh $(DEST_BIN)/mum find $(DEST_APP)/app -type f -iname "*.pyc" -exec rm -f {} \; rm -rf $(DEST_APP)/bower_components/jquery diff --git a/redhat/mum.spec b/redhat/mum.spec index 8e065ae..5fb369a 100644 --- a/redhat/mum.spec +++ b/redhat/mum.spec @@ -1,4 +1,4 @@ -%define _topdir /home/aguilbaud/rpmbuild +%define _topdir %(echo $PWD)/ %define name mum %define release 1 %define version 0.1 @@ -7,6 +7,10 @@ %define DEST_CONF /etc/mum %define DEST_VAR /var/lib/mum %define DEST_BIN /usr/bin +%define DEST_INIT_D /etc/init.d +%define DEST_SYSTEMD /usr/lib/systemd/system +%define DEST_DOC /usr/share/doc/mum +%define DEST_LOGS /var/log/mum Summary: Machines Under Monitoring License: GPL @@ -42,11 +46,13 @@ cp -R views %{buildroot}/%{DEST_APP} cp install.sh %{buildroot}/%{DEST_APP} cp in-venv.sh %{buildroot}/%{DEST_APP} cp mum.conf %{buildroot}/%{DEST_CONF} -#cp $(mum_daemon) $(DEST_INIT_D) -cp README %{buildroot}/%{DEST_APP} +cp mum.service %{buildroot}/%{DEST_SYSTEMD} +cp mum-daemon.sh %{buildroot}/%{DEST_DOC} +cp README %{buildroot}/%{DEST_DOC} cp requirements.txt %{buildroot}/%{DEST_APP} cp mum.sh %{buildroot}/%{DEST_APP} -ln -s mum.sh %{buildroot}/%{DEST_BIN} +ln -s /usr/lib/mum/mum.sh -t %{buildroot}/%{DEST_BIN} +mv %{buildroot}/$(DEST_BIN)/mum.sh %{buildroot}/$(DEST_BIN)/mum find %{buildroot}/%{DEST_APP}/app -type f -iname "*.pyc" -exec rm -f {} \; rm -rf %{buildroot}/%{DEST_APP}/bower_components/jquery @@ -60,10 +66,12 @@ rm -rf %{buildroot}/%{DEST_APP}/bower_components/jquery %{DEST_APP}/install.sh %{DEST_APP}/in-venv.sh %{DEST_CONF}/mum.conf -%{DEST_APP}/README +%{DEST_SYSTEMD}/mum.service +%{DEST_DOC}/mum-daemon.sh +%{DEST_DOC}/README %{DEST_APP}/requirements.txt %{DEST_APP}/mum.sh -%{DEST_BIN}/mum.sh +%{DEST_BIN}/mum %changelog * Thu May 21 2015 Alexis Guilbaud <aguilbaud@codelutin.com> - 0.1-1 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.