/[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.3 by jpp,
Sun Feb  4 18:11:07 2018 UTC
+Revision 1.18 by brianr,
Tue Apr  7 17:56:02 2020 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.2 2018/02/04 17:52:58 jpp Exp $
+ # $Id: smeserver-manager.spec,v 1.17 2020/04/07 13:29:49 brianr Exp $
- Summary: smeserver manager 2 navigation module
+ Summary: Sme server  navigation module : manager 2
  %define name smeserver-manager
  Name: %{name}
  %define version 0.1.0
- %define release 1
+ %define release 15
  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
+ Patch3: smeserver-manager-0.1.0-setuid_groups.patch
+ Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch
+ Patch5: smeserver-manager-0.1.0-add-adminlte.patch
+ Patch6: smeserver-manager-0.1.0-navigation_header_listes.patch
+ Patch7: smeserver-manager-0.1.0-navigation_errors.patch
+ Patch8: smeserver-manager-0.1.0-theme_navig_message.patch
+ Patch9: smeserver-manager-0.1.0-domains_pseudos_hosts.patch
+ Patch10: smeserver-manager-0.1.0-remotax_users_logs.patch
+ Patch11: smeserver-manager-0.1.0-localnetworks-panel-remove-adminlte.patch
+ Patch12: smeserver-manager-0.1.0-localnetworks-remove-db-call-from-del.patch
+ Patch13: smeserver-manager-0.1.0-portforwarding-localnetwork-cleanup.patch
+ Patch14: smeserver-manager-0.1.0-portforwarding-rule-comment-missing.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildRequires: e-smith-devtools
  BuildRequires: gettext
-Line 18 
 BuildRequires: gcc
+Line 32 
 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
+ * Tue Apr 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-14.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
+ - css enhancement in default theme
+ - Fix warnings and typos
+ * Wed Feb 19 2020 Michel Begue <mab974@gmail.com> 0.1.0-10.sme
+ - add panels : domains, hostentries and pseudonyms
+ - remove old navigation menu
+ * Mon Jan 27 2020 Michel Begue <mab974@gmail.com> 0.1.0-9.sme
+ - Fix messages without variables expansion
+ - add a theme switcher
+ - split navigation menu between controller and template
+ - template + event for .conf file
+ * Thu Jan 23 2020 Michel Begue <mab974@gmail.com> 0.1.0-8.sme
+ - Fix errors in Navigation
+ * Wed Jan 22 2020 Michel Begue <mab974@gmail.com> 0.1.0-7.sme
+ - Fix link between Navigation and Theme
+ - Add System and Domain names to available data (header)
+ - Move some data lists from template to controller (select_field)
+ - Integrate last Brian's changes in server-manager2.css (AdminLTE)
+ - Fix some warnings and typos
+ * Fri Jan 17 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.0-6.sme
+ - Add in theme based on AdminLTE html template
+ - Fixes Server name in header (Needs Template expansion - added to Console-Save
+ * Sun Jan 12 2020 Michel Begue <mab974@gmail.com> 0.1.0-5.sme
+ - new theme to come
+ - css enhancement (thanks to B. Read)
+ - panels: reboot and ibays
+ * Wed Jan 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-4.sme
+ - fix setuid with wrapper (remove sudo)
+ - panels quota and groups
+ * 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
-Line 748 
 This RPM contributes the navigation bars
+Line 827 
 This RPM contributes the navigation bars
  %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
  %build
+ # Force creation of potentially empty directories
  perl createlinks
- #gcc -o root/etc/e-smith/web/functions/wrapper manager.c
+ mkdir -p root/etc/e-smith/web/functions2
- #mkdir -p root/home/e-smith/db/navigation
+ mkdir -p root/home/e-smith/db/navigation
- #mkdir -p root/etc/e-smith/web/common/css
+ mkdir -p root/etc/e-smith/web/common/css
+ 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/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
  #mkdir -p root/usr/share/locale/en_US/LC_MESSAGES/
  #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
-Line 762 
 perl createlinks
+Line 862 
 perl createlinks
  #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/manager/html
+ #mkdir -p  root/etc/e-smith/web/panels/manager2/html
- #for file in index initial
+ for file in index               #initial
- #do
+ do
- #    ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/manager/html/${file}.cgi
+     ln -s ../../../functions2/wrapper2 root/etc/e-smith/web/panels/manager2/html/${file}.cgi
- #done
+ done
  # Force creation of potentially empty directories
- #mkdir -p root/etc/e-smith/web/{common,functions}
- #mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,html}
- #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/service
  #mkdir -p root/etc/rc.d/init.d/supervise
  #for service in httpd-admin
-Line 795 
 rm -rf $RPM_BUILD_ROOT
+Line 890 
 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)' \
+ --file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \
+ --file /etc/e-smith/web/functions2/index.cgi 'attr(0500,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)' \
-Line 808 
 rm -f %{name}-%{version}-%{release}-file
+Line 912 
 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/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
+ %postun
  %files -f %{name}-%{version}-%{release}-filelist
  %defattr(-,root,root)

 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