diff --git a/.gitignore b/.gitignore index b332f4b..b432239 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /easytag-2.3.5.tar.xz /easytag-2.3.6.tar.xz /easytag-2.3.7.tar.xz +/easytag-2.4.0.tar.xz diff --git a/easytag-2.3.7-fix-browser-key-event-crash.patch b/easytag-2.3.7-fix-browser-key-event-crash.patch deleted file mode 100644 index e21c96e..0000000 --- a/easytag-2.3.7-fix-browser-key-event-crash.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9371cdeab2a24c07a0572c9fda36babc9f8c7209 Mon Sep 17 00:00:00 2001 -From: David King -Date: Sun, 31 May 2015 21:32:57 +0100 -Subject: [PATCH] Fix crash when pressing a key to change directory - -Use the correct signal handler for key-press-event on the directory -browser tree view. - -https://bugzilla.redhat.com/show_bug.cgi?id=1226671 ---- - data/browser.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/browser.ui b/data/browser.ui -index 115c0ce..7ad1794 100644 ---- a/data/browser.ui -+++ b/data/browser.ui -@@ -127,7 +127,7 @@ - False - True - -- -+ - - - --- -2.4.2 - diff --git a/easytag-2.3.7-fix-flac-header-read-crash.patch b/easytag-2.3.7-fix-flac-header-read-crash.patch deleted file mode 100644 index c7a9624..0000000 --- a/easytag-2.3.7-fix-flac-header-read-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2330fa34ec0c6163aa8f47f5d75a36589234715b Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 15 Jun 2015 05:51:25 +0100 -Subject: [PATCH] Fix crash when failing to read FLAC headers - -Ensure that the GError passed to g_file_read() has been initialized. - -https://bugzilla.redhat.com/show_bug.cgi?id=1231502 ---- - src/tags/flac_header.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tags/flac_header.c b/src/tags/flac_header.c -index f2c1109..fee66b8 100644 ---- a/src/tags/flac_header.c -+++ b/src/tags/flac_header.c -@@ -60,7 +60,7 @@ et_flac_header_read_file_info (GFile *file, - return FALSE; - } - -- istream = g_file_read (file, NULL, &state.error); -+ istream = g_file_read (file, NULL, error); - - if (istream == NULL) - { --- -2.4.3 - diff --git a/easytag.spec b/easytag.spec index c0d762b..14ea525 100644 --- a/easytag.spec +++ b/easytag.spec @@ -1,18 +1,14 @@ %global _hardened_build 1 Name: easytag -Version: 2.3.7 -Release: 4%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Tag editor for MP3, Ogg, FLAC and other music files Group: Applications/Multimedia License: GPLv2+ URL: https://wiki.gnome.org/Apps/EasyTAG Source: https://download.gnome.org/sources/%{name}/2.3/%{name}-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1226671 -Patch0: easytag-2.3.7-fix-browser-key-event-crash.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1231502 -Patch1: easytag-2.3.7-fix-flac-header-read-crash.patch BuildRequires: appdata-tools BuildRequires: desktop-file-utils @@ -49,8 +45,6 @@ easier access to EasyTAG when opening directories and audio files. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build @@ -104,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Aug 29 2015 David King - 2.4.0-1 +- Update to 2.4.0 + * Wed Jun 17 2015 Fedora Release Engineering - 2.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 541be0e..c358fa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2914e730119c4fdd4e42119e9cebf0c7 easytag-2.3.7.tar.xz +5951c735cc997ac3e3d2b7a29da6c413 easytag-2.4.0.tar.xz