--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/06/08 17:27:18 1.26
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/10/05 15:43:13 1.33
@@ -1,10 +1,10 @@
-# $Id: smeserver-manager.spec,v 1.25 2020/05/08 13:02:16 michel Exp $
+# $Id: smeserver-manager.spec,v 1.32 2020/08/17 17:17:11 michel Exp $
Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 0.1.0
-%define release 23
+%define release 30
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -31,18 +31,37 @@ Patch17: %{name}-0.1.0-routes_locales_na
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
+Patch27: %{name}-0.1.0-I18N_cleanup_tests.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
@@ -75,29 +94,22 @@ This RPM contributes the navigation bars
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -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)
@@ -108,12 +120,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
@@ -121,8 +131,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
@@ -131,15 +139,15 @@ 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
@@ -147,6 +155,45 @@ true
%defattr(-,root,root)
%changelog
+* 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
+- 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