/[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.58 by michel,
Wed Jan  5 10:22:17 2022 UTC
+Revision 1.63 by jpp,
Sun Jul 17 05:34:03 2022 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.57 2021/12/27 17:28:17 michel Exp $
  Summary: Sme server  navigation module : manager 2
  %define name smeserver-manager
  Name: %{name}
  %define version 0.1.4
- %define release 11
+ %define release 16
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
-Line 21 
 Patch6: smeserver-manager-0.1.4-fix-tran
+Line 19 
 Patch6: smeserver-manager-0.1.4-fix-tran
  Patch7: smeserver-manager-0.1.4-format-for-dhcp-ips-in-review-config.patch
  Patch8: smeserver-manager-0.1.4-fix_backup_empty_selection_list.patch
  Patch9: smeserver-manager-0.1.4-toggle_password_and_menu-jquery_cond-csrf_get.patch
+ Patch10: smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch
+ Patch11: smeserver-manager-0.1.4-bz12110-untainting-printer.patch
+ Patch12: smeserver-manager-0.1.4-bz12111-untainting-date.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
-Line 63 
 This RPM contributes the navigation bars
+Line 64 
 This RPM contributes the navigation bars
  %patch7 -p1
  %patch8 -p1
  %patch9 -p1
+ %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
  %build
  perl createlinks
-Line 95 
 echo "%doc COPYING f2b/*" >> %{name}-%{v
+Line 99 
 echo "%doc COPYING f2b/*" >> %{name}-%{v
  %clean
  rm -rf $RPM_BUILD_ROOT
- %pre
  %preun
- if [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ]
+ # complete remove
+ if [ $1 == 0 ]
  then
-     unlink %{dir_mngr}/themes/default/public/js/jquery.min.js
+     systemctl stop smanager.service
+     rm -f /home/e-smith/db/navigation2/*
+     rm -f /home/e-smith/db/routes
+     rm -f %{dir_mngr}/themes/default/public/css/*
+     rm -rf %{dir_mngr}/themes/default/public/js
+     find %{dir_mngr}/lib/SrvMngr/I18N/Modules -type f -name '*.pm' -exec rm '{}' \;
  fi
  true
-Line 111 
 then
+Line 119 
 then
          mkdir %{dir_mngr}/themes/default/public/js
      [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] ||
          ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
+     [ -h %{dir_mngr}/themes/default/public/js/jquery.min.map ] ||
+         ln -s /usr/share/javascript/jquery/latest/jquery.min.map %{dir_mngr}/themes/default/public/js/jquery.min.map
  fi
  true
- %postun
  %files -f %{name}-%{version}-%{release}-filelist
  %defattr(-,root,root)
  %changelog
- * Mon Jan 03 2022 Michel Begue <mab974@misouk.com> 0.1.4-11.sme
+ * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-16.sme
+ - untainting datetime [SME: 12111]
+ * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-15.sme
+ - untainting printer [SME: 12110]
+ * Fri Jan 21 2022 Michel Begue <mab974@misouk.com> 0.1.4-14.sme
+ - Fix jquery map link missing
+ - Fix jquery link deleted during update
+ - Remove generated file during remove
+ * Wed Jan 05 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-13.sme
+ - Update-format-for-datetime-and-reboot [SME: 11830]
+ * Mon Jan 03 2022 Michel Begue <mab974@misouk.com> 0.1.4-12.sme
  - Add show password icon to login panel (requires jquery)
  - Extend toggle hide to section menu (requires jquery)
  - Set layout according to jquery presence

 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