From 4e25c172e4920e124a85d29e7036ac5b7964f414729f5110f3e03d38bd5a95f2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 1 Dec 2020 14:09:11 +0000
Subject: [PATCH] Accepting request 851470 from
 home:AndreasStieger:branches:Base:System

- remove deprecated texinfo macros
- silence egrep,fgrep packaging warnings

OBS-URL: https://build.opensuse.org/request/show/851470
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=111
---
 grep-rpmlintrc |  2 ++
 grep.changes   |  6 ++++++
 grep.spec      | 32 +++++++++++---------------------
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 grep-rpmlintrc

diff --git a/grep-rpmlintrc b/grep-rpmlintrc
new file mode 100644
index 0000000..e24d0e2
--- /dev/null
+++ b/grep-rpmlintrc
@@ -0,0 +1,2 @@
+# the package itself still contains the compatibility links
+addFilter("grep.* deprecated-grep .*[ef]grep")
diff --git a/grep.changes b/grep.changes
index a19b9a2..21db552 100644
--- a/grep.changes
+++ b/grep.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 28 09:48:12 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- remove deprecated texinfo macros
+- silence egrep,fgrep packaging warnings
+
 -------------------------------------------------------------------
 Mon Nov  9 15:47:58 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
diff --git a/grep.spec b/grep.spec
index dcd3d8a..39a9ef0 100644
--- a/grep.spec
+++ b/grep.spec
@@ -27,12 +27,11 @@ Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source2:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source3:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring
 Source4:        profile.sh
+Source5:        %{name}-rpmlintrc
 Patch0:         werror-return-type.patch
 BuildRequires:  fdupes
 BuildRequires:  makeinfo
 BuildRequires:  pcre-devel
-Requires(pre):  %{install_info_prereq}
-Requires(preun): %{install_info_prereq}
 Provides:       base:%{_bindir}/grep
 
 %description
@@ -42,8 +41,7 @@ match to a specified pattern.  By default, grep prints the matching lines.
 %lang_package
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 %configure \
@@ -51,16 +49,16 @@ match to a specified pattern.  By default, grep prints the matching lines.
   --without-included-regex \
   %{nil}
 %if 0%{?do_profiling}
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
+  %make_build CFLAGS="%{optflags} %{cflags_profile_generate}"
   sh %{SOURCE4} # profiling run
-  make clean
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
+  %make_build clean
+  %make_build CFLAGS="%{optflags} %{cflags_profile_feedback}"
 %else
-  make %{?_smp_mflags} CFLAGS="%{optflags}"
+  %make_build
 %endif
 
 %check
-make %{?_smp_mflags} check
+%make_build check
 
 %install
 %make_install
@@ -73,14 +71,7 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
 %fdupes -s %{buildroot}
 %find_lang %{name}
 
-%post
-%install_info --info-dir=%{_infodir} %{_infodir}/grep.info%{ext_info}
-
-%preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info%{ext_info}
-
 %files
-%defattr(-,root,root)
 %license COPYING
 %doc README AUTHORS NEWS THANKS TODO ChangeLog*
 %if !0%{?usrmerged}
@@ -91,12 +82,11 @@ ln -sf %{_bindir}/grep %{buildroot}/bin/grep
 %{_bindir}/egrep
 %{_bindir}/fgrep
 %{_bindir}/grep
-%{_mandir}/man1/egrep.1%{ext_man}
-%{_mandir}/man1/fgrep.1%{ext_man}
-%{_mandir}/man1/grep.1%{ext_man}
-%{_infodir}/grep.info%{ext_info}
+%{_mandir}/man1/egrep.1%{?ext_man}
+%{_mandir}/man1/fgrep.1%{?ext_man}
+%{_mandir}/man1/grep.1%{?ext_man}
+%{_infodir}/grep.info%{?ext_info}
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %changelog