--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2018/02/04 17:52:58	1.2
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2019/12/16 17:32:51	1.5
@@ -1,15 +1,18 @@
-# $Id: smeserver-manager.spec,v 1.1 2018/02/04 17:51:12 jpp Exp $
+# $Id: smeserver-manager.spec,v 1.4 2018/12/17 12:01:03 jcrisp Exp $
 
 Summary: smeserver manager 2 navigation module
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 1
+%define release 3
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -17,12 +20,22 @@ 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)
-Provides: server-manager2
+#Requires: smeserver-manager-html
+#Provides: server-manager2
 AutoReqProv: no
 
 %changelog
+* Mon Dec 16 2019 Michel Begue <mab974@gmail.com> 0.1.0-3.sme
+- simple architecture : basic mojolicious app running
+- some panels
+- requires perl-Mojolicious-Plugin-I18N
+
+* Tue Feb 06 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1.0-2.sme
+- Start adding some template files
+
 * Sun Feb 04 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.1.0-1.sme
 - first smeserver-manager package [SME: 10506]
   this is a sandbox to dev the next server-manager based on mojolicious
@@ -746,6 +759,9 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -772,6 +788,7 @@ perl createlinks
 #mkdir -p root/etc/e-smith/web/panels/password/{cgi-bin,html}
 #mkdir -p root/etc/httpd/admin-conf
 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/service
 #mkdir -p root/etc/rc.d/init.d/supervise
@@ -793,7 +810,14 @@ 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)' \
 > %{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)' \
@@ -806,20 +830,40 @@ rm -f %{name}-%{version}-%{release}-file
 #    --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \
 #    --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \
 #    > %{name}-%{version}-%{release}-filelist
-echo "%doc COPYING" >> %{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/default/templates/partials/_navig.html.ep
+chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 
-%postun
 
+
+%postun
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)