From c49027767285c7cf13e2e7a763a70cffc3b3dd422d27b1bf092cd5c101048b56 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 7 Jun 2021 14:55:10 +0000 Subject: [PATCH] Accepting request 898045 from home:jengelh:pic - Drop --with-pic (no effect with --disable-static) OBS-URL: https://build.opensuse.org/request/show/898045 OBS-URL: https://build.opensuse.org/package/show/M17N/anthy?expand=0&rev=48 --- anthy.changes | 7 +++++++ anthy.spec | 14 +++++--------- bugzilla-1175274-emacs-27.1.patch | 6 ++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/anthy.changes b/anthy.changes index 2856ef4..61adcc4 100644 --- a/anthy.changes +++ b/anthy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 7 11:23:57 UTC 2021 - Jan Engelhardt + +- Drop --with-pic (no effect with --disable-static) +- Switch to %autosetup (rediff bugzilla-1175274-emacs-27.1.patch + as p1) + ------------------------------------------------------------------- Wed Sep 30 10:31:45 UTC 2020 - Dr. Werner Fink diff --git a/anthy.spec b/anthy.spec index e92408e..596b38c 100644 --- a/anthy.spec +++ b/anthy.spec @@ -1,7 +1,7 @@ # # spec file for package anthy # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -80,18 +80,14 @@ This package contains all necessary include files and libraries needed to develop applications that require libanthy. %prep -%setup -q -%patch2 -p 1 -%patch3 -p 1 -%patch4 -p 1 -%patch5 -p 0 +%autosetup -p1 %build autoreconf --force --install CFLAGS="%{optflags} -fno-strict-aliasing" \ CXXFLAGS="%{optflags} -fno-strict-aliasing" \ -%configure --disable-static --with-pic -make %{?_smp_mflags} +%configure --disable-static +%make_build %check cd test @@ -99,7 +95,7 @@ cd test %install %make_install -install -m 644 $RPM_SOURCE_DIR/suse-start-anthy.el %{buildroot}%{_datadir}/emacs/site-lisp/ +install -m 644 %{_sourcedir}/suse-start-anthy.el %{buildroot}/%{_datadir}/emacs/site-lisp/ %if %{with xemacs} # compile the XEmacs versions of the emacs-lisp files and install them: pushd src-util diff --git a/bugzilla-1175274-emacs-27.1.patch b/bugzilla-1175274-emacs-27.1.patch index ae44e32..07b325f 100644 --- a/bugzilla-1175274-emacs-27.1.patch +++ b/bugzilla-1175274-emacs-27.1.patch @@ -5,8 +5,10 @@ There is no (process-kill-without-query) anymore, use src-util/anthy.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---- src-util/anthy.el -+++ src-util/anthy.el 2020-08-18 11:58:02.915408190 +0000 +Index: anthy-9100h/src-util/anthy.el +=================================================================== +--- anthy-9100h.orig/src-util/anthy.el ++++ anthy-9100h/src-util/anthy.el @@ -161,11 +161,11 @@ ;; From skk-macs.el From viper-util.el. Welcome!