From 80aba2fbc1ea3b2c1fae98691b43696156d43684 Mon Sep 17 00:00:00 2001
From: gbcox <gbcox@bzb.us>
Date: Feb 18 2020 14:04:54 +0000
Subject: Upstream release rhbz#1803981


---

diff --git a/.gitignore b/.gitignore
index bb59c20..6e8c3f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ picard-0.15beta1.tar.gz
 /picard-a4fff06.tar.gz
 /picard-release-2.2.2.tar.gz
 /picard-release-2.2.3.tar.gz
+/picard-3de8ee4.tar.gz
diff --git a/picard.rpmlintrc b/picard.rpmlintrc
index ca0dbdf..ee9f359 100644
--- a/picard.rpmlintrc
+++ b/picard.rpmlintrc
@@ -1,2 +1,7 @@
-# SPELLING ERRORS
-addFilter(r" spelling-error .* (Transcode|lossy|transcodes)")
+# ERRORS
+addFilter(r" spelling-error .* (Yubikey)")
+addFilter(r" no-manual-page-for-binary picard")
+addFilter(r" invalid-lc-messages-dir")
+addFilter(r" incorrect-locale-subdir")
+addFilter(r" incoherent-version-in-changelog")
+addFilter(r" incorrect-fsf-address")
diff --git a/picard.spec b/picard.spec
index 963729b..9a1196d 100644
--- a/picard.spec
+++ b/picard.spec
@@ -1,12 +1,14 @@
 %global owner   metabrainz
+%global commit 3de8ee49a10472f2b8769c4d45299d1602743878
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           picard
-Version:        2.2.3
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        MusicBrainz-based audio tagger
 License:        GPLv2+
 URL:            https://picard.musicbrainz.org/
-Source0:        https://github.com/%{owner}/%{name}/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz
+Source0:        https://github.com/%{owner}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
 Source1:        picard.rpmlintrc
 BuildRequires:  gcc
 BuildRequires:  desktop-file-utils
@@ -32,7 +34,7 @@ database. The tagger is album or release oriented, rather than
 track-oriented.
 
 %prep
-%autosetup -n %{name}-release-%{version}
+%autosetup -n %{name}-%{commit}
 
 %build
 %{__python3} setup.py config
@@ -65,6 +67,9 @@ desktop-file-install \
 %{python3_sitearch}/picard/
 
 %changelog
+* Tue Feb 18 2020 Gerald Cox <gbcox@fedoraproject.org> - 2.3.0-1.git3de8ee4
+- Upstream release rhbz#1803981
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 8d6c3fa..2f84f94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (picard-release-2.2.3.tar.gz) = 2de1ced5cf07966a865b709734dbb1e04afeefa5d29aff34ba373de29d1ffec350d01280c9a0e318ed8aa893907899bd1a5397d81097a3dca48caef5327547e0
+SHA512 (picard-3de8ee4.tar.gz) = 95e3caedd679c1fc0267179e4b179d15146d9ebac10efb233fb369c36065ee5d33727dc8c812ae2b3060d4c8799ad9e1e6e91c3a9bc46c732e9bb4b6eecdd1a8