/[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.15 by brianr,
Fri Mar 20 15:48:27 2020 UTC
+Revision 1.39 by michel,
Wed Jan 13 19:49:58 2021 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.14 2020/02/29 19:08:19 michel Exp $
+ # $Id: smeserver-manager.spec,v 1.38 2021/01/07 18:55:41 michel Exp $
  Summary: Sme server  navigation module : manager 2
  %define name smeserver-manager
  Name: %{name}
- %define version 0.1.0
+ %define version 0.1.2
- %define release 12
+ %define release 5
  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}-%{version}-bz11185_initial.patch
- Patch1: smeserver-manager-add-basic-files.patch
+ Patch1: %{name}-%{version}-update_systemd.patch
- Patch2: smeserver-manager-0.1.0-mojo_struct.patch
+ Patch2: %{name}-%{version}-viewlogfiles_download.patch
- Patch3: smeserver-manager-0.1.0-setuid_groups.patch
+ Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch
- Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch
+ Patch4: %{name}-%{version}-locales_menu.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
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+ BuildArchitectures: noarch
  BuildRequires: e-smith-devtools
  BuildRequires: gettext
- BuildRequires: gcc
+ #<Build tests>
+ #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
+ #</Build tests>
  Requires: e-smith-lib >= 1.18.0-26
  Requires: e-smith-manager >= 2.4.0-22
- Requires: perl-Mojolicious >= 6.44
+ Requires:  perl(Mojolicious) >= 7.56
- Requires: perl-Mojolicious-Plugin-I18N >= 1.6
+ Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
- Requires: pwauth
+ Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
- Requires: perl(Apache::AuthTkt)
+ Requires:  perl(Net::Netmask) >= 1.9
- #Requires: smeserver-manager-html
+ #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 /usr/share/smanager
+ %description
+ This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
+ %prep
+ %setup
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %patch4 -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
+ 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
+ true
+ %postun
+ %files -f %{name}-%{version}-%{release}-filelist
+ %defattr(-,root,root)
  %changelog
+ * Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme
+ - Fix menu items not translated [SME: 11322]
+ - Add other locales files
+ * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
+ - Fix 404 error when trailing slash is missing
+ - Fix missing translations for ibay and quota panels
+ - Comment out pptp settings in remoteaccess panel
+ - Fix 'sigusr1' exec for httpd  [SME: 11185]
+ * Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
+ - Fix download error on 'viewlogfiles' panel [SME: 11217]
+ - Fix duplicate entries in log files to be chosen
+ - Fix duplicate translation terms in 'General' lexicon
+ * Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
+ - Fix smanager-update event name
+ - Move smanager service to /usr/lib/systemd
+ - Fix Bugreport file download
+ - Fix translations missing in 'viewlogfiles'
+ - Remove Admin auth in httpd configuration
+ - Add an optional alias for admin sign in.
+ - Remove systemctl from .spec file
+ * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
+ - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
+ * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 0.1.0-27.sme
+ - Fix typo in %post here
+ - Complete 'datetime' panel
+ - Fix notification in 'quota' panel
+ * Wed Jul 01 2020 Michel Begue <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 0.1.0-24.sme
+ - Fix missing translations for some panels
+ * Mon Jun 08 2020 Michel Begue <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 0.1.0-19.sme
+ - Remove tests : useraccounts, wbl
+ * 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
-Line 805 
 AutoReqProv: no
+Line 991 
 AutoReqProv: no
  * Tue Mar 14 2000 Charlie Brady <charlieb@e-smith.com>
    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
- %build
- # Force creation of potentially empty directories
- perl createlinks
- 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/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
- ## 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
- 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)' \
- --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)' \
- #    --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
- #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
- %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