From 65445a0200a15f24a565cab66f22f4b02b927aea Mon Sep 17 00:00:00 2001
From: Vasiliy Glazov <vascom2@gmail.com>
Date: Mar 20 2018 13:28:15 +0000
Subject: Merge branch 'master' into f26


---

diff --git a/.gitignore b/.gitignore
index 3772f8a..71bb9d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /mediaconch_17.08.tar.xz
 /mediaconch_17.11.tar.xz
 /mediaconch_17.12.tar.xz
+/mediaconch_18.03.tar.xz
diff --git a/mediaconch.spec b/mediaconch.spec
index 24b2592..e4f19a5 100644
--- a/mediaconch.spec
+++ b/mediaconch.spec
@@ -1,12 +1,12 @@
-%global libmediainfo_version    17.12
+%global libmediainfo_version    18.03
 %global libzen_version          0.4.37
 
 Name:           mediaconch
-Version:        17.12
+Version:        18.03
 Release:        1%{?dist}
 Summary:        Most relevant technical and tag data for video and audio files (CLI)
 
-License:        GPLv3+ and MPLv2.0
+License:        BSD
 URL:            https://mediaarea.net/MediaConch/
 Source0:        https://mediaarea.net/download/source/%{name}/%{version}/%{name}_%{version}.tar.xz
 
@@ -170,7 +170,7 @@ fi
 
 %files
 %doc Release/ReadMe_CLI_Linux.txt History_CLI.txt
-%license License.html License.GPLv3.html License.MPLv2.html
+%license LICENSE License.html
 %{_bindir}/mediaconch
 
 %files server
@@ -182,7 +182,7 @@ fi
 
 %files gui
 %doc Release/ReadMe_GUI_Linux.txt History_GUI.txt
-%license License.html License.GPLv3.html License.MPLv2.html
+%license LICENSE License.html
 %{_bindir}/mediaconch-gui
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
@@ -191,6 +191,12 @@ fi
 
 
 %changelog
+* Tue Mar 20 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 18.03-1
+- Update to 18.03
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 17.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Fri Dec 22 2017 Vasiliy N. Glazov <vascom2@gmail.com> - 17.12-1
 - Update to 17.12
 
diff --git a/sources b/sources
index a916645..a56ddb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mediaconch_17.12.tar.xz) = 70b8cd10c94788088e601d9006a026482d1bc3e3d431d333d1cf07d81a7ac9b2f7574b55dae7ab859bab83c3d8418539a7e89952bbebfaa9b11c459dfa2e3331
+SHA512 (mediaconch_18.03.tar.xz) = 54010d836c043b609089094e19483b77101e27173d7bd7e8d6aeb43ffbbe0f8a0be1de654aa52562b7a1d34b75e79d53d7188888feb929af544389cc479dc763