From 765677aa02999098e1505d34ef847944c94a9ee7 Mon Sep 17 00:00:00 2001 From: David King Date: Feb 21 2016 23:37:53 +0000 Subject: Update to 2.4.2 --- diff --git a/.gitignore b/.gitignore index 0dc12fe..e714a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /easytag-2.3.7.tar.xz /easytag-2.4.0.tar.xz /easytag-2.4.1.tar.xz +/easytag-2.4.2.tar.xz diff --git a/easytag-2.4.1-fix-renaming-files.patch b/easytag-2.4.1-fix-renaming-files.patch deleted file mode 100644 index 5b75a82..0000000 --- a/easytag-2.4.1-fix-renaming-files.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 02650510e0c3f3dcf73544bc9379ce4306fb96c8 Mon Sep 17 00:00:00 2001 -From: David King -Date: Wed, 27 Jan 2016 00:06:17 +0100 -Subject: Fix input of filenames in the file area - -When showing the edit name in the file area, show the new -(as-yet-unsaved) filename, rather than using the old name. ---- - src/file_area.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/file_area.c b/src/file_area.c -index a0cca16..d002861 100644 ---- a/src/file_area.c -+++ b/src/file_area.c -@@ -223,8 +223,7 @@ et_file_area_set_file_fields (EtFileArea *self, - file = g_file_new_for_path (cur_filename); - - info = g_file_query_info (file, G_FILE_ATTRIBUTE_ACCESS_CAN_READ "," -- G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "," -- G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, -+ G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, - G_FILE_QUERY_INFO_NONE, NULL, &error); - - /* Show/hide 'AccessStatusIcon' */ -@@ -300,12 +299,13 @@ et_file_area_set_file_fields (EtFileArea *self, - _("File not found")); - g_object_unref (emblem_icon); - } -+ -+ g_object_unref (info); - } - - -- /* Set filename into name_entry. */ -- basename_utf8 = g_strdup (g_file_info_get_edit_name (info)); -- g_object_unref (info); -+ /* Set new filename into name_entry. This matches the GFile edit name. */ -+ basename_utf8 = g_filename_display_basename (((File_Name *)((GList *)ETFile->FileNameNew)->data)->value); - - /* Remove the extension. */ - if ((pos = strrchr (basename_utf8, '.')) != NULL) --- -cgit v0.11.2 - diff --git a/easytag.spec b/easytag.spec index 0bd14db..e2d1e57 100644 --- a/easytag.spec +++ b/easytag.spec @@ -1,16 +1,14 @@ %global _hardened_build 1 Name: easytag -Version: 2.4.1 -Release: 3%{?dist} +Version: 2.4.2 +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.4/%{name}-%{version}.tar.xz -# Taken from upstream git. -Patch0: easytag-2.4.1-fix-renaming-files.patch BuildRequires: appdata-tools BuildRequires: desktop-file-utils @@ -47,7 +45,6 @@ easier access to EasyTAG when opening directories and audio files. %prep %setup -q -%patch0 -p1 %build @@ -101,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Feb 21 2016 David King - 2.4.2-1 +- Update to 2.4.2 + * Wed Feb 03 2016 Fedora Release Engineering - 2.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d50110c..d5fdf89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a6228ba198b87fb3db04161cd99663f easytag-2.4.1.tar.xz +5e23953573362bcc4113132a4aaae92d easytag-2.4.2.tar.xz