Project

General

Profile

Revision 99bd4776

ID99bd4776501e3e0c2d2a95675fc83a8f938867c8
Parent 7714207c
Child 85fa304f

Added by Aurelien BOMPARD about 12 years ago

Corrections packaging suite à rpmlint

Change-Id: I480e0dc12916e016e98bc3de51d2dfe317341b5a
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/574
Tested-by: Build system <>
Reviewed-by: Aurelien BOMPARD <>

View differences:

Makefile
29 29
	chmod 640 $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/*.ini
30 30
	# Apache
31 31
	mkdir -p $(DESTDIR)$(HTTPD_DIR)
32
	ln -f -s $(SYSCONFDIR)/vigilo/$(NAME)/$(NAME).conf $(DESTDIR)$(HTTPD_DIR)/
33
	echo $(HTTPD_DIR)/$(NAME).conf >> INSTALLED_FILES
32
	ln -f -s $(SYSCONFDIR)/vigilo/$(NAME)/$(NAME).conf $(DESTDIR)$(HTTPD_DIR)/$(PKGNAME).conf
33
	echo $(HTTPD_DIR)/$(PKGNAME).conf >> INSTALLED_FILES
34 34
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
35 35
	[ `id -u` -ne 0 ] || chown $(HTTPD_USER): $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
36
	install -m 644 -p -D deployment/logrotate.conf $(DESTDIR)/etc/logrotate.d/$(NAME)
36
	install -m 644 -p -D deployment/logrotate.conf $(DESTDIR)/etc/logrotate.d/$(PKGNAME)
37 37
	# Déplacement du app_cfg.py
38 38
	mv $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES` $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/
39 39
	ln -s $(SYSCONFDIR)/vigilo/$(NAME)/app_cfg.py $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES`
pkg/vigiboard.mandriva.spec
117 117
%config(noreplace) %{_sysconfdir}/vigilo/%{module}/*.py
118 118
%config(noreplace) %{_sysconfdir}/vigilo/%{module}/*.wsgi
119 119
%config(noreplace) %attr(640,root,apache) %{_sysconfdir}/vigilo/%{module}/*.ini
120
%config(noreplace) /etc/httpd/conf/webapps.d/%{module}.conf
120
%config(noreplace) /etc/httpd/conf/webapps.d/%{name}.conf
121 121
%dir %{_localstatedir}/log/vigilo/
122 122
%attr(750,apache,apache) %{_localstatedir}/log/vigilo/%{module}
123
%config(noreplace) /etc/logrotate.d/%{module}
123
%config(noreplace) /etc/logrotate.d/%{name}
124 124
%attr(750,apache,apache) %{_localstatedir}/cache/vigilo/sessions
125 125
%{python_sitelib}/*
126 126

  
pkg/vigiboard.redhat.spec
67 67
%config(noreplace) %attr(640,root,apache) %{_sysconfdir}/vigilo/%{module}/*.ini
68 68
%ghost %{_sysconfdir}/vigilo/%{module}/*.pyo
69 69
%ghost %{_sysconfdir}/vigilo/%{module}/*.pyc
70
%config(noreplace) /etc/httpd/conf.d/%{module}.conf
70
%config(noreplace) /etc/httpd/conf.d/%{name}.conf
71 71
%dir %{_localstatedir}/log/vigilo/
72 72
%attr(750,apache,apache) %{_localstatedir}/log/vigilo/%{module}
73
%config(noreplace) /etc/logrotate.d/%{module}
73
%config(noreplace) /etc/logrotate.d/%{name}
74 74
%attr(750,apache,apache) %{_localstatedir}/cache/vigilo/sessions
75 75
%{python26_sitelib}/*
76 76

  
pkg/vigiboard.rhel6.spec
59 59
%config(noreplace) %{_sysconfdir}/vigilo/%{module}/*.py
60 60
%config(noreplace) %{_sysconfdir}/vigilo/%{module}/*.wsgi
61 61
%config(noreplace) %attr(640,root,apache) %{_sysconfdir}/vigilo/%{module}/*.ini
62
%config(noreplace) /etc/httpd/conf.d/%{module}.conf
62
%config(noreplace) /etc/httpd/conf.d/%{name}.conf
63 63
%dir %{_localstatedir}/log/vigilo/
64 64
%attr(750,apache,apache) %{_localstatedir}/log/vigilo/%{module}
65
%config(noreplace) /etc/logrotate.d/%{module}
65
%config(noreplace) /etc/logrotate.d/%{name}
66 66
%attr(750,apache,apache) %{_localstatedir}/cache/vigilo/sessions
67 67
%{python_sitelib}/*
68 68

  

Also available in: Unified diff