2 Commits

Author SHA1 Message Date
c4ed6b178d * Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.8.0-41.sme
- fix systemd service file [SME: 12556]
2024-03-26 21:21:23 -04:00
88c2c73ee7 debugsourcefiles 2024-03-12 22:51:54 -04:00
2 changed files with 9 additions and 28 deletions

View File

@@ -4,7 +4,7 @@ Summary: e-smith manager navigation module
%define name e-smith-manager
Name: %{name}
%define version 2.8.0
%define release 39
%define release 41
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -24,6 +24,13 @@ Provides: server-manager
AutoReqProv: no
%changelog
* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.8.0-41.sme
- fix systemd service file [SME: 12556]
* Tue Mar 12 2024 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-40.sme
- tidy rpm
- add -g flag to gcc in order to get debugsourcefiles.list
* Mon Aug 07 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.8.0-39.sme
- Roll up patches and move to git repo [SME: 12338]
@@ -786,7 +793,7 @@ rm -rf root/var/service
%build
perl createlinks
gcc -o root/etc/e-smith/web/functions/wrapper manager.c
gcc -g -o root/etc/e-smith/web/functions/wrapper manager.c
mkdir -p root/home/e-smith/db/navigation
mkdir -p root/etc/e-smith/web/common/css
@@ -809,21 +816,6 @@ mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,html}
mkdir -p root/etc/e-smith/web/panels/password/{cgi-bin,html}
mkdir -p root/etc/httpd/admin-conf
mkdir -p root/service
#mkdir -p root/etc/rc.d/init.d/supervise
#for service in httpd-admin
#do
# ln -s /var/service/$service root/service/$service
# mkdir -p root/var/service/$service/supervise
# touch root/var/service/$service/down
# if [ -d root/var/service/$service/log ]
# then
# mkdir -p root/var/service/$service/log/supervise
# mkdir -p root/var/log/$service
# fi
# ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
#done
%install
rm -rf $RPM_BUILD_ROOT
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -840,12 +832,6 @@ echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
rm -rf $RPM_BUILD_ROOT
%pre
if [ $1 -gt 1 ] ; then
if [ -e /var/service/httpd-admin/run ] ; then
/usr/bin/sv d httpd-admin
/usr/bin/sv d httpd-admin/log
fi
fi
%preun
%post
find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
@@ -853,10 +839,6 @@ find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
xargs grep -l Persisten | \
xargs rm -f
if [ -d /var/service/httpd-admin ] ; then
rm -rf /var/service/httpd-admin
fi
%postun
%files -f %{name}-%{version}-%{release}-filelist

View File

@@ -6,7 +6,6 @@ Documentation=man:apachectl(8)
[Service]
Type=notify
EnvironmentFile=/etc/sysconfig/httpd
ExecStartPre=/sbin/e-smith/service-status httpd-admin
ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
ExecStart=/usr/sbin/httpd -f /etc/httpd/admin-conf/httpd.conf -DFOREGROUND