diff --git a/0001-Don-t-fail-uniquify-tests-in-non-version-controlled-.patch b/0001-Don-t-fail-uniquify-tests-in-non-version-controlled-.patch deleted file mode 100644 index 0a83f6b..0000000 --- a/0001-Don-t-fail-uniquify-tests-in-non-version-controlled-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ca3932121a893df3c4b08dbe11f2c002da4a421f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= -Date: Fri, 13 Sep 2024 12:13:53 +0200 -Subject: [PATCH] Don't fail uniquify-tests in non-version-controlled source - trees - -* test/lisp/uniquify-tests.el (uniquify-project-transform): -Skip test if there is no project (bug#73205). ---- - test/lisp/uniquify-tests.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/lisp/uniquify-tests.el b/test/lisp/uniquify-tests.el -index 4124ce056d3..9b33c9d7d47 100644 ---- a/test/lisp/uniquify-tests.el -+++ b/test/lisp/uniquify-tests.el -@@ -129,6 +129,7 @@ uniquify-trailing-separator-p is ignored" - (require 'project) - (ert-deftest uniquify-project-transform () - "`project-uniquify-dirname-transform' works" -+ (skip-unless (project-current nil source-directory)) - (let ((uniquify-dirname-transform #'project-uniquify-dirname-transform) - (project-vc-name "foo1/bar") - bufs) --- -2.45.1 - diff --git a/emacs.spec b/emacs.spec index 329fae8..15d5932 100644 --- a/emacs.spec +++ b/emacs.spec @@ -8,7 +8,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 30.0.91 +Version: 30.0.92 Release: %autorelease License: GPL-3.0-or-later AND CC0-1.0 URL: https://www.gnu.org/software/emacs/ @@ -55,10 +55,6 @@ Patch: 0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch # gets any new backends, this patch may need extending. Patch: 0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch -# Patch for a failing test (from Emacs Git): -# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73205 -Patch: 0001-Don-t-fail-uniquify-tests-in-non-version-controlled-.patch - BuildRequires: alsa-lib-devel BuildRequires: atk-devel BuildRequires: autoconf