--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2019/12/16 17:32:51 1.5 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/02/19 20:05:06 1.13 @@ -1,10 +1,10 @@ -# $Id: smeserver-manager.spec,v 1.4 2018/12/17 12:01:03 jcrisp Exp $ +# $Id: smeserver-manager.spec,v 1.12 2020/01/27 09:34:11 michel 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 3 +%define release 10 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,6 +13,13 @@ Source: %{name}-%{version}.tar.xz Patch0: smeserver-manager-0.1.0-bz10506.patch Patch1: smeserver-manager-add-basic-files.patch 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext @@ -28,6 +35,39 @@ Requires: perl(Apache::AuthTkt) AutoReqProv: no %changelog +* 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 + +* Wed Jan 01 2020 Michel Begue 0.1.0-4.sme +- fix setuid with wrapper (remove sudo) +- panels quota and groups + * Mon Dec 16 2019 Michel Begue 0.1.0-3.sme - simple architecture : basic mojolicious app running - some panels @@ -762,12 +802,26 @@ This RPM contributes the navigation bars %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build +# Force creation of potentially empty directories perl createlinks -#gcc -o root/etc/e-smith/web/functions/wrapper manager.c -#mkdir -p root/home/e-smith/db/navigation -#mkdir -p root/etc/e-smith/web/common/css +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 @@ -776,20 +830,14 @@ perl createlinks #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/manager/html -#for file in index initial -#do -# ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/manager/html/${file}.cgi -#done +#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/e-smith/web/{common,functions} -#mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,html} -#mkdir -p root/etc/e-smith/web/panels/password/{cgi-bin,html} #mkdir -p root/etc/httpd/admin-conf -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/service #mkdir -p root/etc/rc.d/init.d/supervise #for service in httpd-admin @@ -813,6 +861,8 @@ rm -f %{name}-%{version}-%{release}-file --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 @@ -859,9 +909,12 @@ 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 +chmod 4750 /etc/e-smith/web/functions2/wrapper2 %postun