--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/04/07 13:29:49 1.17 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/08/17 17:17:11 1.32 @@ -1,44 +1,242 @@ -# $Id: smeserver-manager.spec,v 1.16 2020/03/29 15:20:59 brianr Exp $ +# $Id: smeserver-manager.spec,v 1.31 2020/08/08 13:42:03 michel Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.0 -%define release 14 +%define release 29 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -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 -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 -Patch13: smeserver-manager-0.1.0-portforwarding-localnetwork-cleanup.patch +Source: %{name}-0.1.0.tar.xz +Patch0: %{name}-0.1.0-bz10506.patch +Patch1: %{name}-add-basic-files.patch +Patch2: %{name}-0.1.0-mojo_struct.patch +Patch3: %{name}-0.1.0-setuid_groups.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 + + + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext -BuildRequires: gcc +BuildArchitectures: noarch +#BuildRequires: gcc Requires: e-smith-lib >= 1.18.0-26 Requires: e-smith-manager >= 2.4.0-22 Requires: perl-Mojolicious >= 6.44 Requires: perl-Mojolicious-Plugin-I18N >= 1.6 +Requires: perl-Net-Netmask >= 1.9015 +#Requires: js-jquery > 2.2.4-3 (optional) Requires: pwauth -Requires: perl(Apache::AuthTkt) -#Requires: smeserver-manager-html -#Provides: server-manager2 +#Requires: perl(Apache::AuthTkt) +Provides: server-manager AutoReqProv: no +%define dir_mngr /usr/share/smanager + + +%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 +%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 + +%build +perl createlinks + +# Force creation of potentially empty directories +##mkdir -p root/etc/e-smith/web/functions2 +mkdir -p root/etc/e-smith/db/routes +mkdir -p root/home/e-smith/db/navigation2 +#mkdir -p root%{dir_mngr}/html +mkdir -p root%{dir_mngr}/themes/default/public/css + +##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 + + +%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 \ +--dir %{dir_mngr} 'attr(0755,root,root)' \ +--file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \ +--file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ +> %{name}-%{version}-%{release}-filelist + +#--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)' \ + +echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist + + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre + +%preun +# js-jquery from epel +##if (rpm -q js-jquery > /dev/null 2>&1) +if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +then + unlink %{dir_mngr}/themes/default/public/js/jquery.min.js +fi +systemctl disable smanager.service +true + +%post +# js-jquery from epel +##if (rpm -q js-jquery > /dev/null 2>&1) +if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +then + mkdir %{dir_mngr}/themes/default/public/js + ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js +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 +true + +%postun +%files -f %{name}-%{version}-%{release}-filelist +%defattr(-,root,root) + %changelog +* Mon Aug 17 2020 Michel Begue 0.1.0-29.sme +- validate lexicon file before install +- fix route url construction (+) +- add authentication messages to locales + +* Fri Aug 07 2020 Michel Begue 0.1.0-28.sme +- validate netmask in LocalNetworks [SME: 10976] +- validate netmask in RemoteAccess [SME: 10977] +- prettier action button +- accept undescore in lexicon name +- change route urls for LocalNetworks and Portforwarding +- add rendering to LocalNetworks notification + +* Mon Jul 06 2020 Michel Begue 0.1.0-27.sme +- Fix typo in %post here +- Complete 'datetime' panel +- Fix notification in 'quota' panel + +* Wed Jul 01 2020 Michel Begue 0.1.0-26.sme +- Fix first start error +- Fix incorrect messages and various typos in modules +- Add possibility to hide menu(s) (requires jquery) + +* Sat Jun 13 2020 Michel Begue 0.1.0-25.sme +- Remove 'Starterwebsite' panel [SME: 8903] +- Add choice for creating Pseudonyms [SME: 9457] +- Change URL in 'useraccounts' templates +- Change app to smanager in controller 'Swttheme' + +* Wed Jun 10 2020 Michel Begue 0.1.0-24.sme +- Fix missing translations for some panels + +* Mon Jun 08 2020 Michel Begue 0.1.0-23.sme +- Transform to Mojo application (apache/mod_proxy mode) +- Add internal login and multi mode menus +- Add userpassword panel + +* Fri May 08 2020 Michel Begue 0.1.0-22.sme +- Fix translation in 'useraccounts' panel +- Restore theme switcher route +- Fix theme switcher redirection +- fix lexicon file not found [SME: 10927] + +* Mon Apr 27 2020 Michel Begue 0.1.0-21.sme +- Fix error and success management +- Optimize Routes (number) +- Delete share_dir variable +- Attach Locale lexicon to Panel and Panel? +- Fix lack of translation of first page + +* Wed Apr 15 2020 Michel Begue 0.1.0-20.sme +- Patch the I18N plugin to accept namespace changes +- Split global locales files to module level +- Consider additional contrib locales files +- Consider additional contrib routes and navigation item +- fix colour button in portforwarding panel +- fix missing esmith::util in starterwebsite panel + +* Tue Apr 14 2020 Michel Begue 0.1.0-19.sme +- Remove tests : useraccounts, wbl + +* Sat Apr 11 2020 Michel Begue 0.1.0-18.sme +- Add panels : emailaccess, yum, backup +- Fix Rendering comments in portforwarding & localnetworks panels +- Css and images files added (from manager). +- Initial javascript in navigation added (jQuery) -optional- +- Add 'Heading...' navigation informations in controllers +- Show Themes_switch if there is more than one theme + +* Tue Apr 07 2020 Brian Read 0.1.0-15.sme +- Sort out rule comment in portforwarding add panel + * Tue Apr 07 2020 Brian Read 0.1.0-14.sme - Add in portforwarding panel - Clean up localnetwork panel code @@ -816,134 +1014,3 @@ AutoReqProv: no * Tue Mar 14 2000 Charlie Brady Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or .... - 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 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -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/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 -%files -f %{name}-%{version}-%{release}-filelist -%defattr(-,root,root)