--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/07/06 15:19:43 1.30
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/11/19 08:44:01 1.35
@@ -1,112 +1,58 @@
-# $Id: smeserver-manager.spec,v 1.29 2020/07/01 15:16:09 michel Exp $
+# $Id: smeserver-manager.spec,v 1.34 2020/10/07 16:46:34 michel Exp $
Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
-%define version 0.1.0
-%define release 27
+%define version 0.1.2
+%define release 1
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Daemons
-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
-
+Source: %{name}-%{version}.tar.xz
+Patch0: %{name}-%{version}-bz11185_initial.patch
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+BuildArchitectures: noarch
BuildRequires: e-smith-devtools
BuildRequires: gettext
-BuildArchitectures: noarch
-#BuildRequires: gcc
+#
+#BuildRequires: perl >= 0:5.016
+#BuildRequires: perl(Test::More)
+#BuildRequires: perl(Test::Mojo)
+#BuildRequires: perl(Mojolicious) >= 7.56
+#BuildRequires: perl(Mojolicious::Plugin::I18N) >= 1.6
+#BuildRequires: perl(Net::Netmask) >= 1.9
+#
+
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(Mojolicious) >= 7.56
+Requires: perl(Mojolicious::Plugin::I18N) >= 1.6
+Requires: perl(Net::Netmask) >= 1.9
#Requires: js-jquery > 2.2.4-3 (optional)
Requires: pwauth
#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.
+This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
%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
%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)
@@ -117,12 +63,10 @@ rm -f %{name}-%{version}-%{release}-file
--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
+%check
+#cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r
%clean
rm -rf $RPM_BUILD_ROOT
@@ -130,8 +74,6 @@ 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
@@ -140,8 +82,6 @@ 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
@@ -158,6 +98,35 @@ true
%defattr(-,root,root)
%changelog
+* Thu Nov 19 2020 Michel Begue 0.1.2-1.sme
+- Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
+
+* Wed Oct 07 2020 Michel Begue 0.1.0-31.sme
+- smanager-refresh event come back
+- add smanager version in footer
+- add optional refresh in layout
+- fix yum logfile displaying
+
+* Mon Oct 05 2020 Michel Begue 0.1.0-30.sme
+- fix I18N Namespace change for keeping Language
+- clean up emailsettings code
+- remove old global lexicon files
+- add first simple tests
+- add smanager-update event
+
+* 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