--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/04/11 20:28:10 1.20
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/10/07 16:46:34 1.34
@@ -1,15 +1,15 @@
-# $Id: smeserver-manager.spec,v 1.19 2020/04/11 17:08:20 michel Exp $
+# $Id: smeserver-manager.spec,v 1.33 2020/10/05 15:43:13 michel Exp $
Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 0.1.0
-%define release 17
+%define release 31
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Daemons
-Source: %{name}-%{version}.tar.xz
+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
@@ -26,30 +26,217 @@ Patch12: %{name}-0.1.0-localnetworks-rem
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
+Patch27: %{name}-0.1.0-I18N_cleanup_tests.patch
+Patch28: %{name}-0.1.0-yum_refresh_version.patch
+
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+BuildArchitectures: noarch
+
BuildRequires: e-smith-devtools
BuildRequires: gettext
-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: pwauth
-Requires: perl(Apache::AuthTkt)
+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)
-Provides: server-manager2
+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
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+
+%build
+perl createlinks
+
+# Force creation of potentially empty directories
+mkdir -p root/etc/e-smith/db/routes
+mkdir -p root/home/e-smith/db/navigation2
+mkdir -p root%{dir_mngr}/themes/default/public/css
+
+%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
+
+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
+
+%pre
+
+%preun
+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
+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
-* Sat Apr 11 2020 Michel Begue 0.1.0-17.sme
+* 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
+- 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
-- Remove wbl and account tests
- Show Themes_switch if there is more than one theme
* Tue Apr 07 2020 Brian Read 0.1.0-15.sme
@@ -832,87 +1019,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
-
-%build
-perl createlinks
-
-# Force creation of potentially empty directories
-mkdir -p root/etc/e-smith/web/functions2
-mkdir -p root/home/e-smith/db/navigation
-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)