/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager.spec

Diff of /rpms/smeserver-manager/sme10/smeserver-manager.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.14 by michel,
Sat Feb 29 19:08:19 2020 UTC
+Revision 1.21 by michel,
Sun Apr 12 09:02:48 2020 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.13 2020/02/19 20:05:06 michel Exp $
+ # $Id: smeserver-manager.spec,v 1.20 2020/04/11 20:28:10 michel Exp $
  Summary: Sme server  navigation module : manager 2
  %define name smeserver-manager
  Name: %{name}
  %define version 0.1.0
- %define release 11
+ %define release 18
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.xz
- Patch0: smeserver-manager-0.1.0-bz10506.patch
+ Patch0: %{name}-0.1.0-bz10506.patch
- Patch1: smeserver-manager-add-basic-files.patch
+ Patch1: %{name}-add-basic-files.patch
- Patch2: smeserver-manager-0.1.0-mojo_struct.patch
+ Patch2: %{name}-0.1.0-mojo_struct.patch
- Patch3: smeserver-manager-0.1.0-setuid_groups.patch
+ Patch3: %{name}-0.1.0-setuid_groups.patch
- Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch
+ Patch4: %{name}-0.1.0-reboot_ibays_theme.patch
- Patch5: smeserver-manager-0.1.0-add-adminlte.patch
+ Patch5: %{name}-0.1.0-add-adminlte.patch
- Patch6: smeserver-manager-0.1.0-navigation_header_listes.patch
+ Patch6: %{name}-0.1.0-navigation_header_listes.patch
- Patch7: smeserver-manager-0.1.0-navigation_errors.patch
+ Patch7: %{name}-0.1.0-navigation_errors.patch
- Patch8: smeserver-manager-0.1.0-theme_navig_message.patch
+ Patch8: %{name}-0.1.0-theme_navig_message.patch
- Patch9: smeserver-manager-0.1.0-domains_pseudos_hosts.patch
+ Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch
- Patch10: smeserver-manager-0.1.0-remotax_users_logs.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
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildRequires: e-smith-devtools
  BuildRequires: gettext
-Line 31 
 Requires: perl-Mojolicious >= 6.44
+Line 36 
 Requires: perl-Mojolicious >= 6.44
  Requires: perl-Mojolicious-Plugin-I18N >= 1.6
  Requires: pwauth
  Requires: perl(Apache::AuthTkt)
- #Requires: smeserver-manager-html
+ #Requires: js-jquery > 2.2.4-3 (optional)
- #Provides: server-manager2
+ Provides: server-manager2
  AutoReqProv: no
+ %define dir_mngr /etc/e-smith/web/panels/manager2
  %changelog
+ * Sat Apr 11 2020 Michel Begue <mab974@gmail.com> 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
+ - Show Themes_switch if there is more than one theme
+ * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-15.sme
+ - Sort out rule comment in portforwarding add panel
+ * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-14.sme
+ - Add in portforwarding panel
+ - Clean up localnetwork panel code
+ * Sun Mar 29 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-13.sme
+ - Remove Db call in LN_del template
+ - Use Sme-error css class and make sure parameters applied to error message
+ - Remove creation of AdminLTE directories on install
+ * Fri Mar 20 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-12.sme
+ - Add panels : localnetworks
+ - Delete AdminLTE code  - will get added into new rpm
  * Sat Feb 29 2020 Michel Begue <mab974@gmail.com> 0.1.0-11.sme
  - Add panels : remoteaccess, useraccounts and viewlogfiles
  - Fix 'bugreport' download
-Line 817 
 This RPM contributes the navigation bars
+Line 848 
 This RPM contributes the navigation bars
  %patch8 -p1
  %patch9 -p1
  %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
  %build
- # Force creation of potentially empty directories
  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/etc/e-smith/web/common/css
+ mkdir -p root%{dir_mngr}/html
- mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}
+ mkdir -p root%{dir_mngr}/cgi-bin/srvmngr/themes/default/public/css
- mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images
- mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp}
- mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials}
- gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c
+ 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
- #mkdir -p root/usr/share/locale/en_US/LC_MESSAGES/
+ gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c
- #xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright
- ## make header/footer symlinks
- #ln -s head.tmpl root/etc/e-smith/web/common/userpassword_head.tmpl
- #ln -s head.tmpl root/etc/e-smith/web/common/noframes_head.tmpl
- #ln -s foot.tmpl root/etc/e-smith/web/common/noframes_foot.tmpl
- #mkdir -p  root/etc/e-smith/web/panels/manager2/html
  for file in index               #initial
  do
-     ln -s ../../../functions2/wrapper2 root/etc/e-smith/web/panels/manager2/html/${file}.cgi
+     ln -s ../../../functions2/wrapper2 root%{dir_mngr}/html/${file}.cgi
  done
- # Force creation of potentially empty directories
- #mkdir -p root/etc/httpd/admin-conf
- #mkdir -p root/service
- #mkdir -p root/etc/rc.d/init.d/supervise
- #for service in httpd-admin
- #do
- #  ln -s /var/service/$service root/service/$service
- #  mkdir -p root/var/service/$service/supervise
- #  touch root/var/service/$service/down
- #  if [ -d root/var/service/$service/log ]
- #  then
- #    mkdir -p root/var/service/$service/log/supervise
- #    mkdir -p root/var/log/$service
- #  fi
- #  ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service
- #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 \
- --file /etc/e-smith/web/panels/manager2/cgi-bin/wbl 'attr(4750,root,admin)' \
+ --dir %{dir_mngr} 'attr(0755,root,root)' \
- --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)' \
  --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
- # 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)' \
- #    --dir /var/service/httpd-admin 'attr(01755,root,root)' \
- #    --file /var/service/httpd-admin/down 'attr(0644,root,root)' \
- #    --file /var/service/httpd-admin/run 'attr(0755,root,root)' \
- #    --dir /var/service/httpd-admin/log 'attr(0755,root,root)' \
- #    --dir /var/service/httpd-admin/log/supervise 'attr(0700,root,root)' \
- #    --dir /var/service/httpd-admin/supervise 'attr(0700,root,root)' \
- #    --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \
- #    --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \
- #    > %{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
+ # js-jquery from epel
- #rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/images/btn_donateCC_LG.gif
+ ##if (rpm -q js-jquery > /dev/null 2>&1)
- #rm -f /etc/e-smith/web/panels/manager2/cgi-bin/logout
+ 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
- #find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
+ # js-jquery from epel
- #    sed -n '/\/[0-9a-z]\{32\}$/p' | \
+ ##if (rpm -q js-jquery > /dev/null 2>&1)
- #    xargs grep -l Persisten | \
+ if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
- #    xargs rm -f
+ then
- 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
+     mkdir %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js
- 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 /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js/jquery.min.js
- 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
+ fi
- 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/AdminLTE/public/js/navigation.js
- chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/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
- chown root:admin /etc/e-smith/web/functions2/wrapper2
- chmod 4750  /etc/e-smith/web/functions2/wrapper2
  %postun

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1