From: Maximilian Grunow <maximilian@grunow.at>
Date: Fri, 5 May 2023 07:06:03 +0000 (+0000)
Subject: ♻️ updated VLC to version 3.0.18
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=3ebee1a4b9c47b77af95ed70862392128c1f3bee;p=VLC.git

♻️ updated VLC to version 3.0.18
---

diff --git a/FULLNAMES b/FULLNAMES
index 9549224..f6da7ea 100644
--- 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 c70fc0d..2423a30 100644
--- 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 4dffe4d..29cec99 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.16.0
+3.0.18
diff --git a/VLC.sls b/VLC.sls
index f452394..6a12b68 100644
--- 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 cd3e3f7..453dc18 100644
--- 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 2feba44..e3ac5c8 100644
--- 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
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 c4e7f37..e9730f0 100644
Binary files a/repo-ng/vlc-3.0.16-win64.msi and b/repo-ng/vlc-3.0.18-win64.msi differ