/[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.32 by jpp, Wed Dec 11 03:38:35 2019 UTC Revision 1.37 by jpp, Tue Mar 16 20:08:44 2021 UTC
# Line 1  Line 1 
1  # $Id: e-smith-manager.spec,v 1.31 2019/02/02 18:35:45 jpp Exp $  # $Id: e-smith-manager.spec,v 1.36 2020/12/11 04:05:59 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 29  %define release 33
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 24  Patch10: e-smith-manager-2.8.0-bz10209-u Line 24  Patch10: e-smith-manager-2.8.0-bz10209-u
24  Patch11: e-smith-manager-2.8.0-bz8783-bugreport.patch  Patch11: e-smith-manager-2.8.0-bz8783-bugreport.patch
25  Patch12: e-smith-manager-2.8.0-bz10170-SME10eol.patch  Patch12: e-smith-manager-2.8.0-bz10170-SME10eol.patch
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
28    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    Patch17: e-smith-manager-2.8.0-bz10448-bugreport.patch
31    
32  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
33  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
# Line 37  Provides: server-manager Line 41  Provides: server-manager
41  AutoReqProv: no  AutoReqProv: no
42    
43  %changelog  %changelog
44    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-33.sme
45    - fix wrong system mode reported in bugreport [SME: 10448]
46    
47    * Thu Dec 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-32.sme
48    - create -update event [SME: 11144]
49    - migrate httpd-admin to systemd [SME: 11110]
50    
51    * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-31.sme
52    - removing hardcoded ports [SME: 10967]
53    
54    * Wed Dec 18 2019 Michel Begue <mab974@gmail.com> 2.8.0-29.sme
55    - Add a FollowSymlinks for user-password in password/cgi-bin (perl-suid) [SME: 9677]
56    
57  * Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-29.sme  * Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-29.sme
58  - update apache icon path [SME: 9591]  - update apache icon path [SME: 9591]
59    
# Line 774  This RPM contributes the navigation bars Line 791  This RPM contributes the navigation bars
791  %patch11 -p1  %patch11 -p1
792  %patch12 -p1  %patch12 -p1
793  %patch13 -p1  %patch13 -p1
794    %patch14 -p1
795    %patch15 -p1
796    %patch16 -p1
797    rm -rf root/var/service
798    %patch17 -p1
799    
800  %build  %build
801  perl createlinks  perl createlinks
# Line 801  mkdir -p root/etc/e-smith/web/panels/pas Line 823  mkdir -p root/etc/e-smith/web/panels/pas
823  mkdir -p root/etc/httpd/admin-conf  mkdir -p root/etc/httpd/admin-conf
824    
825  mkdir -p root/service  mkdir -p root/service
826  mkdir -p root/etc/rc.d/init.d/supervise  #mkdir -p root/etc/rc.d/init.d/supervise
827  for service in httpd-admin  #for service in httpd-admin
828  do  #do
829    ln -s /var/service/$service root/service/$service  #  ln -s /var/service/$service root/service/$service
830    mkdir -p root/var/service/$service/supervise  #  mkdir -p root/var/service/$service/supervise
831    touch root/var/service/$service/down  #  touch root/var/service/$service/down
832    if [ -d root/var/service/$service/log ]  #  if [ -d root/var/service/$service/log ]
833    then  #  then
834      mkdir -p root/var/service/$service/log/supervise  #    mkdir -p root/var/service/$service/log/supervise
835      mkdir -p root/var/log/$service  #    mkdir -p root/var/log/$service
836    fi  #  fi
837    ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service  #  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
838  done  #done
839    
840  %install  %install
841  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 823  rm -f %{name}-%{version}-%{release}-file Line 845  rm -f %{name}-%{version}-%{release}-file
845      --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)' \
846      --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)' \
847      --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)' \  
848      --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \      --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \
849      > %{name}-%{version}-%{release}-filelist      > %{name}-%{version}-%{release}-filelist
850  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
# Line 838  echo "%doc COPYING" >> %{name}-%{version Line 853  echo "%doc COPYING" >> %{name}-%{version
853  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
854    
855  %pre  %pre
856    if [ $1 -gt 1 ] ; then
857      if [ -e /var/service/httpd-admin/run ] ; then
858           /usr/bin/sv d httpd-admin
859           /usr/bin/sv d httpd-admin/log
860      fi
861    fi
862  %preun  %preun
863  %post  %post
864  find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \  find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
# Line 845  find /etc/e-smith/web/panels/manager/cgi Line 866  find /etc/e-smith/web/panels/manager/cgi
866      xargs grep -l Persisten | \      xargs grep -l Persisten | \
867      xargs rm -f      xargs rm -f
868    
869    if [ -d /var/service/httpd-admin ] ; then
870       rm -rf /var/service/httpd-admin
871    fi
872    
873  %postun  %postun
874    
875  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist

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