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

Diff of /rpms/smeserver-manager/sme10/smeserver-manager.spec

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

Revision 1.30 by michel, Mon Jul 6 15:19:43 2020 UTC Revision 1.39 by michel, Wed Jan 13 19:49:58 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-manager.spec,v 1.29 2020/07/01 15:16:09 michel Exp $  # $Id: smeserver-manager.spec,v 1.38 2021/01/07 18:55:41 michel Exp $
2    
3  Summary: Sme server  navigation module : manager 2  Summary: Sme server  navigation module : manager 2
4  %define name smeserver-manager  %define name smeserver-manager
5  Name: %{name}  Name: %{name}
6  %define version 0.1.0  %define version 0.1.2
7  %define release 27  %define release 5
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-0.1.0.tar.xz  Source: %{name}-%{version}.tar.xz
13  Patch0: %{name}-0.1.0-bz10506.patch  Patch0: %{name}-%{version}-bz11185_initial.patch
14  Patch1: %{name}-add-basic-files.patch  Patch1: %{name}-%{version}-update_systemd.patch
15  Patch2: %{name}-0.1.0-mojo_struct.patch  Patch2: %{name}-%{version}-viewlogfiles_download.patch
16  Patch3: %{name}-0.1.0-setuid_groups.patch  Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch
17  Patch4: %{name}-0.1.0-reboot_ibays_theme.patch  Patch4: %{name}-%{version}-locales_menu.patch
 Patch5: %{name}-0.1.0-add-adminlte.patch  
 Patch6: %{name}-0.1.0-navigation_header_listes.patch  
 Patch7: %{name}-0.1.0-navigation_errors.patch  
 Patch8: %{name}-0.1.0-theme_navig_message.patch  
 Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch  
 Patch10: %{name}-0.1.0-remotax_users_logs.patch  
 Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch  
 Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch  
 Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch  
 Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch  
 Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch  
 Patch16: %{name}-0.1.0-remove_tests.patch  
 Patch17: %{name}-0.1.0-routes_locales_navig.patch  
 Patch18: %{name}-0.1.0-error_success_routes_locales.patch  
 Patch19: %{name}-0.1.0-translation_themes.patch  
 Patch20: %{name}-0.1.0-mojo-app_password_menus.patch  
 Patch21: %{name}-0.1.0-missing_translations.patch  
 Patch22: %{name}-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch  
 Patch23: %{name}-0.1.0-start_service.patch  
 Patch24: %{name}-0.1.0-datetime_quota.patch  
   
18  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
19    BuildArchitectures: noarch
20  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
21  BuildRequires: gettext  BuildRequires: gettext
22  BuildArchitectures: noarch  #<Build tests>
23  #BuildRequires: gcc  #BuildRequires:  perl >= 0:5.016
24    #BuildRequires:  perl(Test::More)
25    #BuildRequires:  perl(Test::Mojo)
26    #BuildRequires:  perl(Mojolicious) >= 7.56
27    #BuildRequires:  perl(Mojolicious::Plugin::I18N) >= 1.6
28    #BuildRequires:  perl(Net::Netmask) >= 1.9
29    #</Build tests>
30    
31  Requires: e-smith-lib >= 1.18.0-26  Requires: e-smith-lib >= 1.18.0-26
32  Requires: e-smith-manager >= 2.4.0-22  Requires: e-smith-manager >= 2.4.0-22
33  Requires: perl-Mojolicious >= 6.44  Requires:  perl(Mojolicious) >= 7.56
34  Requires: perl-Mojolicious-Plugin-I18N >= 1.6  Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
35    Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
36    Requires:  perl(Net::Netmask) >= 1.9
37  #Requires: js-jquery > 2.2.4-3 (optional)  #Requires: js-jquery > 2.2.4-3 (optional)
38  Requires: pwauth  #Requires: pwauth
39  #Requires: perl(Apache::AuthTkt)  #Requires: perl(Apache::AuthTkt)
40    
41  Provides: server-manager  Provides: server-manager
42  AutoReqProv: no  AutoReqProv: no
43    
44  %define dir_mngr /usr/share/smanager  %define dir_mngr /usr/share/smanager
45    
   
46  %description  %description
47  This RPM contributes the navigation bars for the smeserver-manager.  This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
48    
49  %prep  %prep
50  %setup  %setup
# Line 64  This RPM contributes the navigation bars Line 53  This RPM contributes the navigation bars
53  %patch2 -p1  %patch2 -p1
54  %patch3 -p1  %patch3 -p1
55  %patch4 -p1  %patch4 -p1
 %patch5 -p1  
 %patch6 -p1  
 %patch7 -p1  
 %patch8 -p1  
 %patch9 -p1  
 %patch10 -p1  
 %patch11 -p1  
 %patch12 -p1  
 %patch13 -p1  
 %patch14 -p1  
 %patch15 -p1  
 %patch16 -p1  
 %patch17 -p1  
 %patch18 -p1  
 %patch19 -p1  
 %patch20 -p1  
 %patch21 -p1  
 %patch22 -p1  
 %patch23 -p1  
 %patch24 -p1  
56    
57  %build  %build
58  perl createlinks  perl createlinks
59    
60  # Force creation of potentially empty directories  # Force creation of potentially empty directories
 ##mkdir -p root/etc/e-smith/web/functions2  
61  mkdir -p root/etc/e-smith/db/routes  mkdir -p root/etc/e-smith/db/routes
62  mkdir -p root/home/e-smith/db/navigation2  mkdir -p root/home/e-smith/db/navigation2
 #mkdir -p root%{dir_mngr}/html  
63  mkdir -p root%{dir_mngr}/themes/default/public/css  mkdir -p root%{dir_mngr}/themes/default/public/css
64    
 ##ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout  
 #ln -s %{dir_mngr}/conf/srvmngr.conf root/%{dir_mngr}/srvmngr.conf  
 #ln -s %{dir_mngr}/script/srvmngr.pl root/%{dir_mngr}/srvmngr.pl  
   
 ##gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c  
   
 #for file in index              #initial  
 #do  
 #    ln -s ../../../functions2/wrapper2 root%{dir_mngr}/html/${file}.cgi  
 #done  
   
   
65  %install  %install
66  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
67  (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
# Line 117  rm -f %{name}-%{version}-%{release}-file Line 72  rm -f %{name}-%{version}-%{release}-file
72  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \
73  > %{name}-%{version}-%{release}-filelist  > %{name}-%{version}-%{release}-filelist
74    
 #--file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \  
 #--file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \  
 #--file %{dir_mngr}/html/index.cgi 'attr(root,admin)' \  
   
75  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
76    
77    %check
78    #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r
79    
80  %clean  %clean
81  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 130  rm -rf $RPM_BUILD_ROOT Line 83  rm -rf $RPM_BUILD_ROOT
83  %pre  %pre
84    
85  %preun  %preun
 # js-jquery from epel  
 ##if (rpm -q js-jquery > /dev/null 2>&1)  
86  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
87  then  then
88      unlink %{dir_mngr}/themes/default/public/js/jquery.min.js      unlink %{dir_mngr}/themes/default/public/js/jquery.min.js
89  fi  fi
 systemctl disable smanager.service  
90  true  true
91    
92  %post  %post
 # js-jquery from epel  
 ##if (rpm -q js-jquery > /dev/null 2>&1)  
93  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
94  then  then
95      mkdir %{dir_mngr}/themes/default/public/js      mkdir %{dir_mngr}/themes/default/public/js
96      ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js      ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
97  fi  fi
 /sbin/e-smith/expand-template /usr/share/smanager/conf/srvmngr.conf  
 /sbin/e-smith/expand-template /etc/systemd/system/smanager.service  
 systemctl enable smanager.service  
 systemctl restart smanager.service  
98  true  true
99    
100  %postun  %postun
# Line 158  true Line 102  true
102  %defattr(-,root,root)  %defattr(-,root,root)
103    
104  %changelog  %changelog
105    * Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme
106    - Fix menu items not translated [SME: 11322]
107    - Add other locales files
108    
109    * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
110    - Fix 404 error when trailing slash is missing
111    - Fix missing translations for ibay and quota panels
112    - Comment out pptp settings in remoteaccess panel
113    - Fix 'sigusr1' exec for httpd  [SME: 11185]
114    
115    * Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
116    - Fix download error on 'viewlogfiles' panel [SME: 11217]
117    - Fix duplicate entries in log files to be chosen
118    - Fix duplicate translation terms in 'General' lexicon
119    
120    * Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
121    - Fix smanager-update event name
122    - Move smanager service to /usr/lib/systemd
123    - Fix Bugreport file download
124    - Fix translations missing in 'viewlogfiles'
125    - Remove Admin auth in httpd configuration
126    - Add an optional alias for admin sign in.
127    - Remove systemctl from .spec file
128    
129    * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
130    - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
131    
132    * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme
133    - smanager-refresh event come back
134    - add smanager version in footer
135    - add optional refresh in layout
136    - fix yum logfile displaying
137    
138    * Mon Oct 05 2020 Michel Begue <mab974@gmail.com> 0.1.0-30.sme
139    - fix I18N Namespace change for keeping Language
140    - clean up emailsettings code
141    - remove old global lexicon files
142    - add first simple tests
143    - add smanager-update event
144    
145    * Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme
146    - validate lexicon file before install
147    - fix route url construction (+)
148    - add authentication messages to locales
149    
150    * Fri Aug 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-28.sme
151    - validate netmask in LocalNetworks [SME: 10976]
152    - validate netmask in RemoteAccess [SME: 10977]
153    - prettier action button
154    - accept undescore in lexicon name
155    - change route urls for LocalNetworks and Portforwarding
156    - add rendering to LocalNetworks notification
157    
158  * Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme  * Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme
159  - Fix typo in %post here  - Fix typo in %post here
160  - Complete 'datetime' panel  - Complete 'datetime' panel

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