--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/01/12 20:07:49 1.7 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/03/29 15:20:59 1.16 @@ -1,10 +1,10 @@ -# $Id: smeserver-manager.spec,v 1.6 2020/01/04 10:12:41 michel Exp $ +# $Id: smeserver-manager.spec,v 1.15 2020/03/20 15:48:27 brianr Exp $ -Summary: smeserver manager 2 navigation module +Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.0 -%define release 5 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,6 +15,14 @@ Patch1: smeserver-manager-add-basic-file Patch2: smeserver-manager-0.1.0-mojo_struct.patch Patch3: smeserver-manager-0.1.0-setuid_groups.patch Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch +Patch5: smeserver-manager-0.1.0-add-adminlte.patch +Patch6: smeserver-manager-0.1.0-navigation_header_listes.patch +Patch7: smeserver-manager-0.1.0-navigation_errors.patch +Patch8: smeserver-manager-0.1.0-theme_navig_message.patch +Patch9: smeserver-manager-0.1.0-domains_pseudos_hosts.patch +Patch10: smeserver-manager-0.1.0-remotax_users_logs.patch +Patch11: smeserver-manager-0.1.0-localnetworks-panel-remove-adminlte.patch +Patch12: smeserver-manager-0.1.0-localnetworks-remove-db-call-from-del.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext @@ -30,7 +38,46 @@ Requires: perl(Apache::AuthTkt) AutoReqProv: no %changelog -* Wed Jan 12 2020 Michel Begue 0.1.0-5.sme +* Sun Mar 29 2020 Brian Read 0.1.0-13.sme +- Remove Db call in LN_del template +- Use Sme-error css class and make sure parameters applied to error message +- Remove creation of AdminLTE directories on install + +* Fri Mar 20 2020 Brian Read 0.1.0-12.sme +- Add panels : localnetworks +- Delete AdminLTE code - will get added into new rpm + +* Sat Feb 29 2020 Michel Begue 0.1.0-11.sme +- Add panels : remoteaccess, useraccounts and viewlogfiles +- Fix 'bugreport' download +- css enhancement in default theme +- Fix warnings and typos + +* Wed Feb 19 2020 Michel Begue 0.1.0-10.sme +- add panels : domains, hostentries and pseudonyms +- remove old navigation menu + +* Mon Jan 27 2020 Michel Begue 0.1.0-9.sme +- Fix messages without variables expansion +- add a theme switcher +- split navigation menu between controller and template +- template + event for .conf file + +* Thu Jan 23 2020 Michel Begue 0.1.0-8.sme +- Fix errors in Navigation + +* Wed Jan 22 2020 Michel Begue 0.1.0-7.sme +- Fix link between Navigation and Theme +- Add System and Domain names to available data (header) +- Move some data lists from template to controller (select_field) +- Integrate last Brian's changes in server-manager2.css (AdminLTE) +- Fix some warnings and typos + +* Fri Jan 17 2020 Brian Read 0.1.0-6.sme +- Add in theme based on AdminLTE html template +- Fixes Server name in header (Needs Template expansion - added to Console-Save + +* Sun Jan 12 2020 Michel Begue 0.1.0-5.sme - new theme to come - css enhancement (thanks to B. Read) - panels: reboot and ibays @@ -775,6 +822,14 @@ This RPM contributes the navigation bars %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build # Force creation of potentially empty directories @@ -784,9 +839,8 @@ 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} +#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 @@ -876,6 +930,8 @@ chown root:admin /etc/e-smith/web/panels 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/AdminLTE/public/js/navigation.js +#chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/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