♻️ updated VLC to version 3.0.18

diff --git a/FULLNAMES b/FULLNAMES
index 954922417a6bfe6ccb7e9e77f8abb13e47daf654..f6da7ead4b21c464e35a4c7cff5c4333bcf44b46 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1,2 +1 @@
-VLC media player 3.0.16 (64-bit)
-VLC media player 3.0.16
+VLC media player 3.0.18

diff --git a/LICENSE b/LICENSE
index c70fc0db0a1550ac33aa46a1388e2a32ad5bb17e..2423a30e2652783cde4cf462a7748f3ba99734f6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file
+Copyright (c) 2023 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file

diff --git a/VERSION b/VERSION
index 4dffe4d086e1ea642bbc73c42d83ce1ec3db0762..29cec99e71f55f66e72601de9b20e1bde0054680 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.16.0
+3.0.18

diff --git a/VLC.sls b/VLC.sls
index f452394d221ea267da19652f54cab85295eee274..6a12b68b992a737990ec76f9089ce8a93cc3838c 100644 (file)
--- a/VLC.sls
+++ b/VLC.sls
@@ -1,11 +1,11 @@
 ###############################################################################
 # SLS: PACKAGE
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Author:               Helmuth Varkoly
+# Author:               Helmuth Varkoly, Maximilian Grunow
 #
-# Description:          SLS to use with OSS's softwaremanagement              
+# Description:          SLS to use with Cranix's softwaremanagement              
 ###############################################################################
 PACKAGE:
   pkg:

diff --git a/oss-pkg-VLC.spec.in b/oss-pkg-VLC.spec.in
index cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930..453dc1844e1b796928b9ae060f0f441985653121 100644 (file)
--- a/oss-pkg-VLC.spec.in
+++ b/oss-pkg-VLC.spec.in
@@ -4,7 +4,7 @@
 #
 
 Name:         oss-pkg-PACKAGE
-Summary:      Package to install PACKAGE on OSS-Clients
+Summary:      Package to install PACKAGE on Cranix-Clients
 Version:      VERSION
 Release:      RELEASE
 License:      GPL-2.0
@@ -21,7 +21,7 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install PACKAGE on OSS-Clients
+Package to install PACKAGE on Cranix-Clients
 
 Authors:
 --------

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 2feba4484fa3f08c7657edf80d4225da01f55c31..e3ac5c8194cb994411aec1b4fd53515b325ebb5a 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,34 +1,21 @@
 ###############################################################################
 # SLS: VLC
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Authors:               Helmuth Varkoly
+# Authors:              Helmuth Varkoly, Maximilian Grunow
 #
 # Description:          Package SLS
 # Note: No loggiung
 ###############################################################################
-{% if grains['cpuarch'] == 'AMD64' %}
-{% set ARCH = "x64" %}
-{% else %}
-{% set ARCH = "x86" %}
-{% endif %}
-
-{% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 VLC:
-  '3.0.16.0':
-    {% if ARCH == 'x64' %}
-    full_name: 'VLC media player 3.0.16 (64-bit)'
-    installer: salt://win/repo-ng/VLC/vlc-3.0.16-win64.msi
-    uninstaller: salt://win/repo-ng/VLC/vlc-3.0.16-win64.msi
-    {% else %}
-    full_name: 'VLC media player 3.0.16'
-    installer: salt://win/repo-ng/VLC/vlc-3.0.16-win32.msi
-    uninstaller: salt://win/repo-ng/VLC/vlc-3.0.16-win32.msi
-    {% endif %}
-    install_flags: '/q /l* {{ LOG_PATH }}\VLC_inst.log ALLUSERS=1'
-    uninstall_flags: '/q /l* {{ LOG_PATH }}\VLC_uninst.log'
+  '3.0.18':
+    full_name: 'VLC media player 3.0.18'
+    installer: salt://win/repo-ng/VLC/vlc-3.0.19-win64.msi
+    uninstaller: salt://win/repo-ng/VLC/vlc-3.0.18-win64.msi
+    install_flags: '/q ALLUSERS=1'
+    uninstall_flags: '/q'
     msiexec: True
     locale: de_DE
     reboot: False

diff --git a/repo-ng/vlc-3.0.16-win32.msi b/repo-ng/vlc-3.0.16-win32.msi
deleted file mode 100644 (file)
index 40121a3..0000000
Binary files a/repo-ng/vlc-3.0.16-win32.msi and /dev/null differ

diff --git a/repo-ng/vlc-3.0.16-win64.msi b/repo-ng/vlc-3.0.18-win64.msi
similarity index 79%
rename from repo-ng/vlc-3.0.16-win64.msi
rename to repo-ng/vlc-3.0.18-win64.msi
index c4e7f37e408e17dc4d7cb44c885e215facb53524..e9730f079501d5f48ff1e20d17e09ad4d15ffe01 100644 (file)
Binary files a/repo-ng/vlc-3.0.16-win64.msi and b/repo-ng/vlc-3.0.18-win64.msi differ