From 989aa50b1d843bfefd9e918ee107e359b2dd81c0 Mon Sep 17 00:00:00 2001 From: Jacek Migacz Date: Fri, 6 Aug 2021 11:19:08 +0200 Subject: [PATCH] Fix FTBFS in Red Hat Enterprise Linux 9 CentOS Stream Resolves: #1951306 --- .gitignore | 6 +-- emacs-auctex.spec | 16 ++++--- fix_fsf_address_and_whitespace.patch | 62 ---------------------------- 3 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 fix_fsf_address_and_whitespace.patch diff --git a/.gitignore b/.gitignore index c0b19b5..1445f24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -auctex-11.86.tar.gz -/auctex-11.87.tar.gz -/auctex-11.88.tar.gz -/auctex-11.89.tar.gz -/auctex-12.1.tar.gz +/auctex-*.tar.gz diff --git a/emacs-auctex.spec b/emacs-auctex.spec index f16d257..5f74bcd 100644 --- a/emacs-auctex.spec +++ b/emacs-auctex.spec @@ -11,8 +11,8 @@ Summary: Enhanced TeX modes for Emacs Name: emacs-auctex -Version: 12.1 -Release: 10%{?dist} +Version: 12.3 +Release: 1%{?dist} License: GPLv3+ and GFDL URL: http://www.gnu.org/software/auctex/ Requires: emacs(bin) >= %{_emacs_version} @@ -26,10 +26,6 @@ Requires: tex-preview = %{version}-%{release} Source0: http://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -# Patch to fix FSF address in some files. Sent upstream 25th Feb 2018. -# Should not be needed after version 12.1 -Patch0: fix_fsf_address_and_whitespace.patch - BuildArch: noarch BuildRequires: emacs tex(latex) texinfo-tex ghostscript @@ -64,8 +60,6 @@ including HTML and PDF. Summary: Preview style files for LaTeX Requires: tex(latex) Provides: tex(preview.sty) -Obsoletes: tetex-preview -Provides: tetex-preview # This is the latest build we accidentally provided from texlive Obsoletes: texlive-preview <= 7:svn44883 Provides: texlive-preview @@ -93,7 +87,6 @@ Emacs. %prep %setup -q -n auctex-%{version} -%patch0 -p1 %build %if %{separate_preview} @@ -167,6 +160,11 @@ touch %{buildroot}%{_emacs_sitelispdir}/auctex/style/.nosearch %doc doc/html %changelog +* Fri Aug 6 2021 Jacek Migacz - 12.3-1 +- Fix build failure on CentOS Stream. Related: rhbz#1951306 +- Revert patch for FSF addresses (it became obsolete with 12.2) +- Remove Obsoletes and Provides tetex-preview + * Thu Apr 15 2021 Mohan Boddu - 12.1-10 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/fix_fsf_address_and_whitespace.patch b/fix_fsf_address_and_whitespace.patch deleted file mode 100644 index f3f20c0..0000000 --- a/fix_fsf_address_and_whitespace.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up auctex-12.1/multi-prompt.el.orig auctex-12.1/multi-prompt.el ---- auctex-12.1/multi-prompt.el.orig 2017-12-10 20:49:45.000000000 +0000 -+++ auctex-12.1/multi-prompt.el 2018-02-25 20:18:00.089207976 +0000 -@@ -11,15 +11,16 @@ - ;; it under the terms of the GNU General Public License as published by - ;; the Free Software Foundation; either version 3, or (at your option) - ;; any later version. --;; -+;; - ;; This program is distributed in the hope that it will be useful, - ;; but WITHOUT ANY WARRANTY; without even the implied warranty of - ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ;; GNU General Public License for more details. --;; -+;; - ;; You should have received a copy of the GNU General Public License --;; along with this program; if not, write to the Free Software --;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+;; along with AUCTeX; see the file COPYING. If not, write to the Free -+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+;; MA 02110-1301 USA. - - ;;; Commentary: - -diff -up auctex-12.1/style/comment.el.orig auctex-12.1/style/comment.el ---- auctex-12.1/style/comment.el.orig 2017-12-10 20:49:45.000000000 +0000 -+++ auctex-12.1/style/comment.el 2018-02-25 19:46:37.977791016 +0000 -@@ -21,8 +21,8 @@ - - ;; You should have received a copy of the GNU General Public License - ;; along with AUCTeX; see the file COPYING. If not, write to the Free --;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --;; 02111-1307, USA. -+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+;; MA 02110-1301 USA. - - ;;; Commentary: - -diff -up auctex-12.1/style/latexinfo.el.orig auctex-12.1/style/latexinfo.el ---- auctex-12.1/style/latexinfo.el.orig 2017-12-10 20:49:45.000000000 +0000 -+++ auctex-12.1/style/latexinfo.el 2018-02-25 20:16:49.776341548 +0000 -@@ -8,15 +8,16 @@ - ;; it under the terms of the GNU General Public License as published by - ;; the Free Software Foundation; either version 3, or (at your option) - ;; any later version. --;; -+;; - ;; This program is distributed in the hope that it will be useful, - ;; but WITHOUT ANY WARRANTY; without even the implied warranty of - ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ;; GNU General Public License for more details. --;; -+;; - ;; You should have received a copy of the GNU General Public License --;; along with this program; if not, write to the Free Software --;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+;; along with AUCTeX; see the file COPYING. If not, write to the Free -+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+;; MA 02110-1301 USA. - - ;;; Code: -