/[smeserver]/rpms/e-smith-manager/sme10/e-smith-manager.spec
ViewVC logotype

Diff of /rpms/e-smith-manager/sme10/e-smith-manager.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.34 by jpp, Sat Jun 27 18:28:04 2020 UTC Revision 1.36 by jpp, Fri Dec 11 04:05:59 2020 UTC
# Line 1  Line 1 
1  # $Id: e-smith-manager.spec,v 1.33 2019/12/20 19:41:05 michel Exp $  # $Id: e-smith-manager.spec,v 1.35 2020/12/11 04:00:40 jpp Exp $
2    
3  Summary: e-smith manager navigation module  Summary: e-smith manager navigation module
4  %define name e-smith-manager  %define name e-smith-manager
5  Name: %{name}  Name: %{name}
6  %define version 2.8.0  %define version 2.8.0
7  %define release 31  %define release 32
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 26  Patch12: e-smith-manager-2.8.0-bz10170-S Line 26  Patch12: e-smith-manager-2.8.0-bz10170-S
26  Patch13: e-smith-manager-2.8.0-bz9591-iconspath.patch  Patch13: e-smith-manager-2.8.0-bz9591-iconspath.patch
27  Patch14: e-smith-manager-2.8.0-bz9677_password_followsymlinks.patch  Patch14: e-smith-manager-2.8.0-bz9677_password_followsymlinks.patch
28  Patch15: e-smith-manager-2.8.0-bz10967-remove-hardcoded-ports.patch  Patch15: e-smith-manager-2.8.0-bz10967-remove-hardcoded-ports.patch
29    Patch16: e-smith-manager-2.8.0-bz11144-bz11110-systemd-update.patch
30    
31  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
32  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
# Line 39  Provides: server-manager Line 40  Provides: server-manager
40  AutoReqProv: no  AutoReqProv: no
41    
42  %changelog  %changelog
43    * Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-32.sme
44    - create -update event [SME: 11144]
45    - migrate httpd-admin to systemd [SME: 11110]
46    
47  * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-31.sme  * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-31.sme
48  - removing hardcoded ports [SME: 10967]  - removing hardcoded ports [SME: 10967]
49    
# Line 784  This RPM contributes the navigation bars Line 789  This RPM contributes the navigation bars
789  %patch13 -p1  %patch13 -p1
790  %patch14 -p1  %patch14 -p1
791  %patch15 -p1  %patch15 -p1
792    %patch16 -p1
793    rm -rf root/var/service
794    
795  %build  %build
796  perl createlinks  perl createlinks
# Line 811  mkdir -p root/etc/e-smith/web/panels/pas Line 818  mkdir -p root/etc/e-smith/web/panels/pas
818  mkdir -p root/etc/httpd/admin-conf  mkdir -p root/etc/httpd/admin-conf
819    
820  mkdir -p root/service  mkdir -p root/service
821  mkdir -p root/etc/rc.d/init.d/supervise  #mkdir -p root/etc/rc.d/init.d/supervise
822  for service in httpd-admin  #for service in httpd-admin
823  do  #do
824    ln -s /var/service/$service root/service/$service  #  ln -s /var/service/$service root/service/$service
825    mkdir -p root/var/service/$service/supervise  #  mkdir -p root/var/service/$service/supervise
826    touch root/var/service/$service/down  #  touch root/var/service/$service/down
827    if [ -d root/var/service/$service/log ]  #  if [ -d root/var/service/$service/log ]
828    then  #  then
829      mkdir -p root/var/service/$service/log/supervise  #    mkdir -p root/var/service/$service/log/supervise
830      mkdir -p root/var/log/$service  #    mkdir -p root/var/log/$service
831    fi  #  fi
832    ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service  #  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
833  done  #done
834    
835  %install  %install
836  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 833  rm -f %{name}-%{version}-%{release}-file Line 840  rm -f %{name}-%{version}-%{release}-file
840      --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \      --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \
841      --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \      --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \
842      --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \      --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \
     --dir /var/service/httpd-admin 'attr(01755,root,root)' \  
     --file /var/service/httpd-admin/down 'attr(0644,root,root)' \  
     --file /var/service/httpd-admin/run 'attr(0755,root,root)' \  
     --dir /var/service/httpd-admin/log 'attr(0755,root,root)' \  
     --dir /var/service/httpd-admin/log/supervise 'attr(0700,root,root)' \  
     --dir /var/service/httpd-admin/supervise 'attr(0700,root,root)' \  
     --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \  
843      --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \      --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \
844      > %{name}-%{version}-%{release}-filelist      > %{name}-%{version}-%{release}-filelist
845  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
# Line 848  echo "%doc COPYING" >> %{name}-%{version Line 848  echo "%doc COPYING" >> %{name}-%{version
848  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
849    
850  %pre  %pre
851    if [ $1 -gt 1 ] ; then
852      if [ -e /var/service/httpd-admin/run ] ; then
853           /usr/bin/sv d httpd-admin
854           /usr/bin/sv d httpd-admin/log
855      fi
856    fi
857  %preun  %preun
858  %post  %post
859  find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \  find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed