From 3cfce793cc9eef825140d9eeb6462a1c33a342d529dffb33aea492e82641bb82 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 26 Oct 2022 12:27:21 +0000
Subject: [PATCH] Accepting request 1031334 from home:Andreas_Schwab:Factory

- Fix typos in etags manpage
- Don't disable PIE

OBS-URL: https://build.opensuse.org/request/show/1031334
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=333
---
 emacs-28.1.dif  | 24 ++----------------------
 emacs-rpmlintrc |  2 --
 emacs.changes   |  6 ++++++
 emacs.spec      |  6 ++----
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/emacs-28.1.dif b/emacs-28.1.dif
index 265efa3..5002363 100644
--- a/emacs-28.1.dif
+++ b/emacs-28.1.dif
@@ -98,7 +98,7 @@
  \fIfile\fP .\|.\|.
  
 -\fBctags\fP [\|\-aCdgIQRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
-+\fBgnuctag\fP [\|\-aCdgIQRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
++\fBgnuctags\fP [\|\-aCdgIQRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
  .if n .br
  [\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|]
  [\|\-\-parse\-stdin=\fIfile\fP\|]
@@ -134,7 +134,7 @@
  The default is to use the delimiter "\|\fB/\fP\|", to search \fIforwards\fP
  through files.
 -Only \fBctags\fP accepts this option.
-+Only \fBgnuctag\fP accepts this option.
++Only \fBgnuctags\fP accepts this option.
  .TP
  .B \-\-declarations
  In C and derived languages, create tags for function declarations,
@@ -168,15 +168,6 @@
  Print usage information.  Followed by one or more \-\-language=LANG
 --- lib-src/Makefile.in
 +++ lib-src/Makefile.in	2020-08-11 10:31:37.642931244 +0000
-@@ -30,6 +30,8 @@ CC=@CC@
- CFLAGS=@CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
-+override CFLAGS := $(CFLAGS:-fno-PIE=-g) -fPIE
-+override LDFLAGS += -pie
- 
- version=@version@
- ## Used in $archlibdir.
 @@ -134,7 +136,7 @@ MKDIR_P = @MKDIR_P@
  CLIENTW = @CLIENTW@
  
@@ -205,17 +196,6 @@
  #ifdef WINDOWSNT
  #include "ntlib.h"
  #undef _WIN32_WINNT
---- lib/Makefile.in
-+++ lib/Makefile.in	2020-08-11 10:17:21.102266456 +0000
-@@ -33,6 +33,8 @@ all:
- 
- HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
- 
-+override CFLAGS := $(CFLAGS) -fPIC
-+
- ALL_CFLAGS= \
-   $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) $(DEPFLAGS) \
-   $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
 --- lisp/cmuscheme.el
 +++ lisp/cmuscheme.el	2020-08-11 10:17:21.106266385 +0000
 @@ -231,7 +231,8 @@ is run).
diff --git a/emacs-rpmlintrc b/emacs-rpmlintrc
index dfb562e..b338b1a 100644
--- a/emacs-rpmlintrc
+++ b/emacs-rpmlintrc
@@ -1,12 +1,10 @@
 addFilter(".*zero-length.*/var/games/emacs/.*-scores.*")
 addFilter(".*non-etc-or-var-file-marked-as-conffile.*/usr/share/emacs/site-lisp/site-start.el.*")
 addFilter(".*name-repeated-in-summar.*")
-addFilter(".*position-independent-executable-suggested.*/usr/bin/emacs-.*")
 addFilter(".*files-duplicate.*/usr/share/emacs.*")
 addFilter(".*desktopfile-without-binary.*/usr/share/applications/emacs.desktop.*emacs.*")
 addFilter(".*emacs-info.noarch:.*W:.*package-with-huge-docs:.*100%.*")
 addFilter(".*emacs-eln.*:.*W:.*unstripped-binary-or-object.*")
 addFilter(".*emacs-eln.*:.*E:.*shared-library-without-dependency-information.*")
-addFilter(".*position-independent-executable-suggested.*")
 addFilter(".*desktopfile-without-binary.*")
 addFilter(".*E:.*invalid-desktopfile.*/usr/share/applications/emacsclient.*\.desktop.*")
diff --git a/emacs.changes b/emacs.changes
index 50ea532..9f2b9b0 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 26 11:56:36 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- Fix typos in etags manpage
+- Don't disable PIE
+
 -------------------------------------------------------------------
 Sun Jun 19 23:02:39 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
 
diff --git a/emacs.spec b/emacs.spec
index f9d8eca..197ec53 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -158,13 +158,13 @@ Requires(pre):  fileutils
 Requires(pre):  group(games)
 Requires(pre):  user(games)
 %endif
-Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
+Source:         https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
 Source4:        emacs-rpmlintrc
 Source5:        emacs.sh
-Source6:        ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
+Source6:        https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
 # https://ftp.gnu.org/gnu/gnu-keyring.gpg
 Source7:        %{name}.keyring
 Source8:        emacs-%{version}-pdf.tar.xz
@@ -412,13 +412,11 @@ VERSION=%{version}
 %endif
  CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
 LDFLAGS=
-  cflags -Wl,-no-pie             LDFLAGS
   cflags -pipe                   CFLAGS
   cflags -Wno-pointer-sign       CFLAGS
   cflags -Wno-unused-variable    CFLAGS
   cflags -Wno-unused-label       CFLAGS
   cflags -fno-optimize-sibling-calls CFLAGS
-  cflags -fno-PIE                CFLAGS
   cflags -Wl,-O2		 LDFLAGS
 %ifarch ia64
  CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')