diff --git a/e-smith-manager.spec b/e-smith-manager.spec index 54f766e..7627deb 100644 --- a/e-smith-manager.spec +++ b/e-smith-manager.spec @@ -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 40 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -24,6 +24,10 @@ Provides: server-manager AutoReqProv: no %changelog +* Tue Mar 12 2024 Jean-Philippe Pialasse 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 2.8.0-39.sme - Roll up patches and move to git repo [SME: 12338] @@ -786,7 +790,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 +813,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 +829,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 +836,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