--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/05/08 13:02:16 1.25 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/06/08 17:27:18 1.26 @@ -1,10 +1,10 @@ -# $Id: smeserver-manager.spec,v 1.24 2020/04/27 07:24:02 michel Exp $ +# $Id: smeserver-manager.spec,v 1.25 2020/05/08 13:02:16 michel Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.0 -%define release 22 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -30,23 +30,128 @@ Patch16: %{name}-0.1.0-remove_tests.patc 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 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: pwauth -Requires: perl(Apache::AuthTkt) #Requires: js-jquery > 2.2.4-3 (optional) +Requires: pwauth +#Requires: perl(Apache::AuthTkt) Provides: server-manager AutoReqProv: no -%define dir_mngr /etc/e-smith/web/panels/manager2 +%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 + +%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 /etc/systemd/system/smanager.service +systemctl enable smanager.service +true + +%postun +%files -f %{name}-%{version}-%{release}-filelist +%defattr(-,root,root) %changelog +* 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 @@ -859,92 +964,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 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -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}/cgi-bin/srvmngr/themes/default/public/css - -ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout -ln -s %{dir_mngr}/cgi-bin/srvmngr/conf/srvmngr.conf root/%{dir_mngr}/cgi-bin/srvmngr/srvmngr.conf -ln -s %{dir_mngr}/cgi-bin/srvmngr/script/srvmngr.pl root/%{dir_mngr}/cgi-bin/srvmngr/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 /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)' \ ---file %{dir_mngr}/cgi-bin/srvmngr/log/development.log 'attr(0660,root,admin)' \ -> %{name}-%{version}-%{release}-filelist -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}/cgi-bin/srvmngr/themes/default/public/js/jquery.min.js -fi - -%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}/cgi-bin/srvmngr/themes/default/public/js - ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js/jquery.min.js -fi - - -%postun -%files -f %{name}-%{version}-%{release}-filelist -%defattr(-,root,root)