1 |
# $Id: smeserver-manager.spec,v 1.31 2020/08/08 13:42:03 michel Exp $ |
# $Id: smeserver-manager.spec,v 1.37 2020/12/01 17:53:43 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 29 |
%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}-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 |
|
Patch4: %{name}-0.1.0-reboot_ibays_theme.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 |
|
|
Patch25: %{name}-0.1.0-bz10976_bz10977_others.patch |
|
|
Patch26: %{name}-0.1.0-route_lexicon_locales.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 |
BuildArchitectures: noarch |
#<Build tests> |
22 |
#BuildRequires: gcc |
#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: perl-Net-Netmask >= 1.9015 |
Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12 |
35 |
|
Requires: perl(Net::Netmask) >= 1.9 |
36 |
#Requires: js-jquery > 2.2.4-3 (optional) |
#Requires: js-jquery > 2.2.4-3 (optional) |
37 |
Requires: pwauth |
#Requires: pwauth |
38 |
#Requires: perl(Apache::AuthTkt) |
#Requires: perl(Apache::AuthTkt) |
39 |
|
|
40 |
Provides: server-manager |
Provides: server-manager |
41 |
AutoReqProv: no |
AutoReqProv: no |
42 |
|
|
43 |
%define dir_mngr /usr/share/smanager |
%define dir_mngr /usr/share/smanager |
44 |
|
|
|
|
|
45 |
%description |
%description |
46 |
This RPM contributes the navigation bars for the smeserver-manager. |
This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version. |
47 |
|
|
48 |
%prep |
%prep |
49 |
%setup |
%setup |
51 |
%patch1 -p1 |
%patch1 -p1 |
52 |
%patch2 -p1 |
%patch2 -p1 |
53 |
%patch3 -p1 |
%patch3 -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 |
|
|
%patch25 -p1 |
|
|
%patch26 -p1 |
|
54 |
|
|
55 |
%build |
%build |
56 |
perl createlinks |
perl createlinks |
57 |
|
|
58 |
# Force creation of potentially empty directories |
# Force creation of potentially empty directories |
|
##mkdir -p root/etc/e-smith/web/functions2 |
|
59 |
mkdir -p root/etc/e-smith/db/routes |
mkdir -p root/etc/e-smith/db/routes |
60 |
mkdir -p root/home/e-smith/db/navigation2 |
mkdir -p root/home/e-smith/db/navigation2 |
|
#mkdir -p root%{dir_mngr}/html |
|
61 |
mkdir -p root%{dir_mngr}/themes/default/public/css |
mkdir -p root%{dir_mngr}/themes/default/public/css |
62 |
|
|
|
##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 |
|
|
|
|
|
|
|
63 |
%install |
%install |
64 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
65 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
70 |
--file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ |
--file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ |
71 |
> %{name}-%{version}-%{release}-filelist |
> %{name}-%{version}-%{release}-filelist |
72 |
|
|
|
#--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)' \ |
|
|
|
|
73 |
echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist |
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 |
%clean |
79 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
81 |
%pre |
%pre |
82 |
|
|
83 |
%preun |
%preun |
|
# js-jquery from epel |
|
|
##if (rpm -q js-jquery > /dev/null 2>&1) |
|
84 |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
85 |
then |
then |
86 |
unlink %{dir_mngr}/themes/default/public/js/jquery.min.js |
unlink %{dir_mngr}/themes/default/public/js/jquery.min.js |
87 |
fi |
fi |
|
systemctl disable smanager.service |
|
88 |
true |
true |
89 |
|
|
90 |
%post |
%post |
|
# js-jquery from epel |
|
|
##if (rpm -q js-jquery > /dev/null 2>&1) |
|
91 |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
92 |
then |
then |
93 |
mkdir %{dir_mngr}/themes/default/public/js |
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 |
ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js |
95 |
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 |
|
96 |
true |
true |
97 |
|
|
98 |
%postun |
%postun |
100 |
%defattr(-,root,root) |
%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 |
* Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme |
140 |
- validate lexicon file before install |
- validate lexicon file before install |
141 |
- fix route url construction (+) |
- fix route url construction (+) |