From: buildmaster <buildmaster@git.cephalix.eu>
Date: Mon, 29 Jun 2020 06:46:17 +0000 (+0200)
Subject: Update to 3.0.11
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=72d3d21309d5f879695d32395ce4449c6282d86a;p=VLC.git

Update to 3.0.11
---

diff --git a/FULLNAMES b/FULLNAMES
index 0ec355a..443b142 100644
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1 +1,2 @@
-VLC media player
+VLC media player 3.0.11 (64-bit)
+VLC media player 3.0.11
diff --git a/VERSION b/VERSION
index 67786e2..95268d1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.8
+3.0.11.0
diff --git a/oss-pkg-VLC.spec b/oss-pkg-VLC.spec
index 39954cd..61d3e3a 100644
--- a/oss-pkg-VLC.spec
+++ b/oss-pkg-VLC.spec
@@ -1,12 +1,12 @@
 #
 # Spec file for VLC
-# Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
+# Copyright (c) 2019 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
 Name:         oss-pkg-VLC
 Summary:      Package to install VLC on OSS-Clients
-Version:      3.0.3
-Release:      4
+Version:      3.0.8
+Release:      5
 License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
 Packager:     peter@varkoly.de
diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 48a6d46..be675ef 100644
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -14,19 +14,22 @@
 {% set ARCH = "x86" %}
 {% endif %}
 
+{% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 VLC:
-  '3.0.8':
-    full_name: 'VLC media player'
+  '3.0.11.0':
     {% if ARCH == 'x64' %}
-    installer: salt://win/repo-ng/VLC/vlc-3.0.8-win64.exe
+    full_name: 'VLC media player 3.0.11 (64-bit)'
+    installer: salt://win/repo-ng/VLC/vlc-3.0.11-win64.msi
+    uninstaller: salt://win/repo-ng/VLC/vlc-3.0.11-win64.msi
     {% else %}
-    installer: salt://win/repo-ng/VLC/vlc-3.0.8-win32.exe
+    full_name: 'VLC media player 3.0.11'
+    installer: salt://win/repo-ng/VLC/vlc-3.0.11-win32.msi
+    uninstaller: salt://win/repo-ng/VLC/vlc-3.0.11-win32.msi
     {% endif %}
-    uninstaller: '%PROGRAMFILES%\VideoLAN\VLC\uninstall.exe'
-    install_flags: '/S'
-    uninstall_flags: '/S'
-    msiexec: False
+    install_flags: '/q /l* {{ LOG_PATH }}\VLC_inst.log ALLUSERS=2'
+    uninstall_flags: '/q /l* {{ LOG_PATH }}\VLC_uninst.log'
+    msiexec: True
     locale: de_DE
     reboot: False
     cache_dir: False
diff --git a/repo-ng/vlc-3.0.8-win64.exe b/repo-ng/vlc-3.0.11-win32.msi
old mode 100755
new mode 100644
similarity index 68%
rename from repo-ng/vlc-3.0.8-win64.exe
rename to repo-ng/vlc-3.0.11-win32.msi
index 5737ae4..4d807cf
Binary files a/repo-ng/vlc-3.0.8-win64.exe and b/repo-ng/vlc-3.0.11-win32.msi differ
diff --git a/repo-ng/vlc-3.0.8-win32.exe b/repo-ng/vlc-3.0.11-win64.msi
old mode 100755
new mode 100644
similarity index 66%
rename from repo-ng/vlc-3.0.8-win32.exe
rename to repo-ng/vlc-3.0.11-win64.msi
index c6d5d4f..32b3c71
Binary files a/repo-ng/vlc-3.0.8-win32.exe and b/repo-ng/vlc-3.0.11-win64.msi differ