/[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.9 by brianr, Tue Jan 21 07:34:29 2020 UTC Revision 1.38 by michel, Thu Jan 7 18:55:41 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-manager.spec,v 1.8 2020/01/12 20:09:06 michel Exp $  # $Id: smeserver-manager.spec,v 1.37 2020/12/01 17:53:43 michel Exp $
2    
3  Summary: smeserver manager 2 navigation module  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 6  %define release 4
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}-%{version}.tar.xz  Source: %{name}-%{version}.tar.xz
13  Patch0: smeserver-manager-0.1.0-bz10506.patch  Patch0: %{name}-%{version}-bz11185_initial.patch
14  Patch1: smeserver-manager-add-basic-files.patch  Patch1: %{name}-%{version}-update_systemd.patch
15  Patch2: smeserver-manager-0.1.0-mojo_struct.patch  Patch2: %{name}-%{version}-viewlogfiles_download.patch
16  Patch3: smeserver-manager-0.1.0-setuid_groups.patch  Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch
 Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch  
 Patch5: smeserver-manager-0.1.0-add-adminlte.patch  
17  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
18    BuildArchitectures: noarch
19  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
20  BuildRequires: gettext  BuildRequires: gettext
21  BuildRequires: gcc  #<Build tests>
22    #BuildRequires:  perl >= 0:5.016
23    #BuildRequires:  perl(Test::More)
24    #BuildRequires:  perl(Test::Mojo)
25    #BuildRequires:  perl(Mojolicious) >= 7.56
26    #BuildRequires:  perl(Mojolicious::Plugin::I18N) >= 1.6
27    #BuildRequires:  perl(Net::Netmask) >= 1.9
28    #</Build tests>
29    
30  Requires: e-smith-lib >= 1.18.0-26  Requires: e-smith-lib >= 1.18.0-26
31  Requires: e-smith-manager >= 2.4.0-22  Requires: e-smith-manager >= 2.4.0-22
32  Requires: perl-Mojolicious >= 6.44  Requires:  perl(Mojolicious) >= 7.56
33  Requires: perl-Mojolicious-Plugin-I18N >= 1.6  Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
34  Requires: pwauth  Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
35  Requires: perl(Apache::AuthTkt)  Requires:  perl(Net::Netmask) >= 1.9
36  #Requires: smeserver-manager-html  #Requires: js-jquery > 2.2.4-3 (optional)
37  #Provides: server-manager2  #Requires: pwauth
38    #Requires: perl(Apache::AuthTkt)
39    
40    Provides: server-manager
41  AutoReqProv: no  AutoReqProv: no
42    
43    %define dir_mngr /usr/share/smanager
44    
45    %description
46    This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
47    
48    %prep
49    %setup
50    %patch0 -p1
51    %patch1 -p1
52    %patch2 -p1
53    %patch3 -p1
54    
55    %build
56    perl createlinks
57    
58    # Force creation of potentially empty directories
59    mkdir -p root/etc/e-smith/db/routes
60    mkdir -p root/home/e-smith/db/navigation2
61    mkdir -p root%{dir_mngr}/themes/default/public/css
62    
63    %install
64    rm -rf $RPM_BUILD_ROOT
65    (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
66    rm -f %{name}-%{version}-%{release}-filelist
67    /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
68    --dir %{dir_mngr} 'attr(0755,root,root)' \
69    --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \
70    --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \
71    > %{name}-%{version}-%{release}-filelist
72    
73    echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
74    
75    %check
76    #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r
77    
78    %clean
79    rm -rf $RPM_BUILD_ROOT
80    
81    %pre
82    
83    %preun
84    if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
85    then
86        unlink %{dir_mngr}/themes/default/public/js/jquery.min.js
87    fi
88    true
89    
90    %post
91    if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
92    then
93        mkdir %{dir_mngr}/themes/default/public/js
94        ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
95    fi
96    true
97    
98    %postun
99    %files -f %{name}-%{version}-%{release}-filelist
100    %defattr(-,root,root)
101    
102  %changelog  %changelog
103    * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
104    - Fix 404 error when trailing slash is missing
105    - Fix missing translations for ibay and quota panels
106    - Comment out pptp settings in remoteaccess panel
107    - Fix 'sigusr1' exec for httpd  [SME: 11185]
108    
109    * Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
110    - Fix download error on 'viewlogfiles' panel [SME: 11217]
111    - Fix duplicate entries in log files to be chosen
112    - Fix duplicate translation terms in 'General' lexicon
113    
114    * Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
115    - Fix smanager-update event name
116    - Move smanager service to /usr/lib/systemd
117    - Fix Bugreport file download
118    - Fix translations missing in 'viewlogfiles'
119    - Remove Admin auth in httpd configuration
120    - Add an optional alias for admin sign in.
121    - Remove systemctl from .spec file
122    
123    * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
124    - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
125    
126    * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme
127    - smanager-refresh event come back
128    - add smanager version in footer
129    - add optional refresh in layout
130    - fix yum logfile displaying
131    
132    * Mon Oct 05 2020 Michel Begue <mab974@gmail.com> 0.1.0-30.sme
133    - fix I18N Namespace change for keeping Language
134    - clean up emailsettings code
135    - remove old global lexicon files
136    - add first simple tests
137    - add smanager-update event
138    
139    * Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme
140    - validate lexicon file before install
141    - fix route url construction (+)
142    - add authentication messages to locales
143    
144    * Fri Aug 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-28.sme
145    - validate netmask in LocalNetworks [SME: 10976]
146    - validate netmask in RemoteAccess [SME: 10977]
147    - prettier action button
148    - accept undescore in lexicon name
149    - change route urls for LocalNetworks and Portforwarding
150    - add rendering to LocalNetworks notification
151    
152    * Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme
153    - Fix typo in %post here
154    - Complete 'datetime' panel
155    - Fix notification in 'quota' panel
156    
157    * Wed Jul 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-26.sme
158    - Fix first start error
159    - Fix incorrect messages and various typos in modules
160    - Add possibility to hide menu(s) (requires jquery)
161    
162    * Sat Jun 13 2020 Michel Begue <mab974@gmail.com> 0.1.0-25.sme
163    - Remove 'Starterwebsite' panel [SME: 8903]
164    - Add choice for creating Pseudonyms [SME: 9457]
165    - Change URL in 'useraccounts' templates
166    - Change app to smanager in controller 'Swttheme'
167    
168    * Wed Jun 10 2020 Michel Begue <mab974@gmail.com> 0.1.0-24.sme
169    - Fix missing translations for some panels
170    
171    * Mon Jun 08 2020 Michel Begue <mab974@gmail.com> 0.1.0-23.sme
172    - Transform to Mojo application (apache/mod_proxy mode)
173    - Add internal login and multi mode menus
174    - Add userpassword panel
175    
176    * Fri May 08 2020 Michel Begue <mab974@gmail.com> 0.1.0-22.sme
177    - Fix translation in 'useraccounts' panel
178    - Restore theme switcher route
179    - Fix theme switcher redirection
180    - fix lexicon file not found [SME: 10927]
181    
182    * Mon Apr 27 2020 Michel Begue <mab974@gmail.com> 0.1.0-21.sme
183    - Fix error and success management
184    - Optimize Routes (number)
185    - Delete share_dir variable
186    - Attach Locale lexicon to Panel and Panel?
187    - Fix lack of translation of first page
188    
189    * Wed Apr 15 2020 Michel Begue <mab974@gmail.com> 0.1.0-20.sme
190    - Patch the I18N plugin to accept namespace changes
191    - Split global locales files to module level
192    - Consider additional contrib locales files
193    - Consider additional contrib routes and navigation item
194    - fix colour button in portforwarding panel
195    - fix missing esmith::util in starterwebsite panel
196    
197    * Tue Apr 14 2020 Michel Begue <mab974@gmail.com> 0.1.0-19.sme
198    - Remove tests : useraccounts, wbl
199    
200    * Sat Apr 11 2020 Michel Begue <mab974@gmail.com> 0.1.0-18.sme
201    - Add panels : emailaccess, yum, backup
202    - Fix Rendering comments in portforwarding & localnetworks panels
203    - Css and images files added (from manager).
204    - Initial javascript in navigation added (jQuery) -optional-
205    - Add 'Heading...'  navigation informations in controllers
206    - Show Themes_switch if there is more than one theme
207    
208    * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-15.sme
209    - Sort out rule comment in portforwarding add panel
210    
211    * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-14.sme
212    - Add in portforwarding panel
213    - Clean up localnetwork panel code
214    
215    * Sun Mar 29 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-13.sme
216    - Remove Db call in LN_del template
217    - Use Sme-error css class and make sure parameters applied to error message
218    - Remove creation of AdminLTE directories on install
219    
220    * Fri Mar 20 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-12.sme
221    - Add panels : localnetworks
222    - Delete AdminLTE code  - will get added into new rpm
223    
224    * Sat Feb 29 2020 Michel Begue <mab974@gmail.com> 0.1.0-11.sme
225    - Add panels : remoteaccess, useraccounts and viewlogfiles
226    - Fix 'bugreport' download
227    - css enhancement in default theme
228    - Fix warnings and typos
229    
230    * Wed Feb 19 2020 Michel Begue <mab974@gmail.com> 0.1.0-10.sme
231    - add panels : domains, hostentries and pseudonyms
232    - remove old navigation menu
233    
234    * Mon Jan 27 2020 Michel Begue <mab974@gmail.com> 0.1.0-9.sme
235    - Fix messages without variables expansion
236    - add a theme switcher
237    - split navigation menu between controller and template
238    - template + event for .conf file
239    
240    * Thu Jan 23 2020 Michel Begue <mab974@gmail.com> 0.1.0-8.sme
241    - Fix errors in Navigation
242    
243    * Wed Jan 22 2020 Michel Begue <mab974@gmail.com> 0.1.0-7.sme
244    - Fix link between Navigation and Theme
245    - Add System and Domain names to available data (header)
246    - Move some data lists from template to controller (select_field)
247    - Integrate last Brian's changes in server-manager2.css (AdminLTE)
248    - Fix some warnings and typos
249    
250  * Fri Jan 17 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-6.sme  * Fri Jan 17 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-6.sme
251  - Add in theme based on AdminLTE html template  - Add in theme based on AdminLTE html template
252  - Fixes Server name in header (Needs Template expansion - added to Console-Save  - Fixes Server name in header (Needs Template expansion - added to Console-Save
# Line 769  AutoReqProv: no Line 985  AutoReqProv: no
985  * Tue Mar 14 2000 Charlie Brady <charlieb@e-smith.com>  * Tue Mar 14 2000 Charlie Brady <charlieb@e-smith.com>
986    Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or ....    Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or ....
987  - initial release  - initial release
   
 %description  
 This RPM contributes the navigation bars for the smeserver-manager.  
   
 %prep  
 %setup  
 %patch0 -p1  
 %patch1 -p1  
 %patch2 -p1  
 %patch3 -p1  
 %patch4 -p1  
 %patch5 -p1  
   
 %build  
 # Force creation of potentially empty directories  
 perl createlinks  
 mkdir -p root/etc/e-smith/web/functions2  
 mkdir -p root/home/e-smith/db/navigation  
 mkdir -p root/etc/e-smith/web/common/css  
 mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}  
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images  
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp}  
 mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials}  
   
 gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c  
   
 #mkdir -p root/usr/share/locale/en_US/LC_MESSAGES/  
 #xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright  
 ## make header/footer symlinks  
 #ln -s head.tmpl root/etc/e-smith/web/common/userpassword_head.tmpl  
 #ln -s head.tmpl root/etc/e-smith/web/common/noframes_head.tmpl  
 #ln -s foot.tmpl root/etc/e-smith/web/common/noframes_foot.tmpl  
   
 #mkdir -p  root/etc/e-smith/web/panels/manager2/html  
 for file in index               #initial  
 do  
     ln -s ../../../functions2/wrapper2 root/etc/e-smith/web/panels/manager2/html/${file}.cgi  
 done  
   
 # Force creation of potentially empty directories  
 #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)  
 rm -f %{name}-%{version}-%{release}-filelist  
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  
 --file /etc/e-smith/web/panels/manager2/cgi-bin/wbl 'attr(4750,root,admin)' \  
 --file /etc/e-smith/web/panels/manager2/cgi-bin/useraccounts 'attr(4750,root,admin)' \  
 --dir /etc/e-smith/web/panels/manager2 'attr(0755,root,root)' \  
 --file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \  
 --file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \  
 > %{name}-%{version}-%{release}-filelist  
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  
   
   
 # Samples only  
 #    --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \  
 #    --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \  
 #    --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)' \  
 #    --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \  
 #    > %{name}-%{version}-%{release}-filelist  
   
 %clean  
 rm -rf $RPM_BUILD_ROOT  
   
 %pre  
 %preun  
 #rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/css/sme_core.css  
 #rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/images/btn_donateCC_LG.gif  
 #rm -f /etc/e-smith/web/panels/manager2/cgi-bin/logout  
   
 %post  
 #find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \  
 #    sed -n '/\/[0-9a-z]\{32\}$/p' | \  
 #    xargs grep -l Persisten | \  
 #    xargs rm -f  
 ln -s /etc/e-smith/web/common/css/sme_core.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_core.css  
 ln -s /etc/e-smith/web/common/css/sme_main.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_main.css  
 ln -s /etc/e-smith/web/common/css/sme_menu.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_menu.css  
 ln -s /etc/e-smith/web/common/btn_donateCC_LG.gif /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/btn_donateCC_LG.gif  
 ln -s /etc/e-smith/web/common/smeserver_logo.jpg /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/smeserver_logo.jpg  
 ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.conf  
 ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.pl  
 ln -s /etc/e-smith/web/common/cgi-bin/logout /etc/e-smith/web/panels/manager2/cgi-bin/logout  
 /sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf  
 chmod 0755 /etc/e-smith/web/panels/manager2/html/index.cgi  
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log  
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log  
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js  
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js  
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep  
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep  
 chown root:admin /etc/e-smith/web/functions2/wrapper2  
 chmod 4750  /etc/e-smith/web/functions2/wrapper2  
   
   
 %postun  
 %files -f %{name}-%{version}-%{release}-filelist  
 %defattr(-,root,root)  

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