/[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.29 by michel,
Wed Jul  1 15:16:09 2020 UTC
+Revision 1.34 by michel,
Wed Oct  7 16:46:34 2020 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.28 2020/06/13 06:08:01 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 26
+ %define release 31
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
 Line 34 
 Patch20: %{name}-0.1.0-mojo-app_password
  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
- BuildArchitectures: noarch
+ #<Build tests>
- #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
+ #</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:  perl(Net::Netmask) >= 1.9
  #Requires: js-jquery > 2.2.4-3 (optional)
  Requires: pwauth
  #Requires: perl(Apache::AuthTkt)
  Provides: server-manager
  AutoReqProv: no
-Line 82 
 This RPM contributes the navigation bars
+Line 98 
 This RPM contributes the navigation bars
  %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/web/functions2
  mkdir -p root/etc/e-smith/db/routes
  mkdir -p root/home/e-smith/db/navigation2
- #mkdir -p root%{dir_mngr}/html
  mkdir -p root%{dir_mngr}/themes/default/public/css
- ##ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout
- #ln -s %{dir_mngr}/conf/srvmngr.conf root/%{dir_mngr}/srvmngr.conf
- #ln -s %{dir_mngr}/script/srvmngr.pl root/%{dir_mngr}/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)
-Line 115 
 rm -f %{name}-%{version}-%{release}-file
+Line 122 
 rm -f %{name}-%{version}-%{release}-file
  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \
  > %{name}-%{version}-%{release}-filelist
- #--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)' \
  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
-Line 128 
 rm -rf $RPM_BUILD_ROOT
+Line 133 
 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}/themes/default/public/js/jquery.min.js
-Line 138 
 systemctl disable smanager.service
+Line 141 
 systemctl disable smanager.service
  true
  %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}/themes/default/public/js
-Line 148 
 fi
+Line 149 
 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.srvice
+ systemctl restart smanager.service
  true
  %postun
-Line 156 
 true
+Line 157 
 true
  %defattr(-,root,root)
  %changelog
+ * 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

 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