From fada82f87b65aae90dafe212e76ae63af490c121 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Nov 2022 01:36:40 -0500
Subject: [PATCH] import hexedit-1.6-1.el9

---
 .gitignore                                    |  2 +-
 .hexedit.metadata                             |  2 +-
 ...it-1.5.patch => hexedit-1.6-fix-lsm.patch} | 28 +++++++++++--------
 SPECS/hexedit.spec                            | 19 +++++++++----
 4 files changed, 31 insertions(+), 20 deletions(-)
 rename SOURCES/{hexedit-1.5.patch => hexedit-1.6-fix-lsm.patch} (58%)

diff --git a/.gitignore b/.gitignore
index 75393e7..56d2d9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/1.5.tar.gz
+SOURCES/hexedit-1.6.tar.gz
diff --git a/.hexedit.metadata b/.hexedit.metadata
index e4da327..93813be 100644
--- a/.hexedit.metadata
+++ b/.hexedit.metadata
@@ -1 +1 @@
-e49d5a613d2c4540b03563db5eb8e827793f77b2 SOURCES/1.5.tar.gz
+561e967aecff92a487614ed0f98f917949b39ac4 SOURCES/hexedit-1.6.tar.gz
diff --git a/SOURCES/hexedit-1.5.patch b/SOURCES/hexedit-1.6-fix-lsm.patch
similarity index 58%
rename from SOURCES/hexedit-1.5.patch
rename to SOURCES/hexedit-1.6-fix-lsm.patch
index de3431e..06453ec 100644
--- a/SOURCES/hexedit-1.5.patch
+++ b/SOURCES/hexedit-1.6-fix-lsm.patch
@@ -1,27 +1,31 @@
 Author:Filip Januš <fjanus@redhat.com>
 This patch fixs inconsistency between filename and configure.ac
 
-diff -ur hexedit-1.5/configure.ac hxpatch/configure.ac
---- hexedit-1.5/configure.ac	2020-08-28 11:51:07.000000000 +0200
-+++ hxpatch/configure.ac	2021-03-16 15:37:40.127591071 +0100
-@@ -14,7 +14,7 @@
+diff -ur hexedit-1.6.old/configure.ac hexedit-1.6/configure.ac
+--- hexedit-1.6.old/configure.ac	2022-04-22 09:06:10.000000000 +0100
++++ hexedit-1.6/configure.ac	2022-05-02 22:30:54.942894809 +0100
+@@ -15,7 +15,7 @@
  VERSION=TheVERSION
  INCL=hexedit.h
  SRCS="hexedit.c display.c mark.c page.c file.c interact.c misc.c search.c"
--OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit-TheVERSION.lsm Makefile.in configure.in Makefile-build.in"
-+OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit.lsm Makefile.in configure.in Makefile-build.in"
+-OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit-TheVERSION.lsm Makefile.in configure.ac Makefile-build.in"
++OTHER="COPYING Changes TODO install-sh configure config.h.in hexedit.1 hexedit.lsm Makefile.in configure.ac Makefile-build.in"
  AC_SUBST(PRODUCT)
  AC_SUBST(VERSION)
  AC_SUBST(INCL)
-@@ -72,4 +72,4 @@
+@@ -74,5 +74,5 @@
  #endif
  )
  
--AC_OUTPUT(Makefile Makefile-build hexedit.1)
-+AC_OUTPUT(Makefile Makefile-build hexedit.1 hexedit.lsm)
-diff -ur hexedit-1.5/hexedit.lsm.in hxpatch/hexedit.lsm.in
---- hexedit-1.5/hexedit.lsm.in	2020-08-28 11:51:07.000000000 +0200
-+++ hxpatch/hexedit.lsm.in	2021-03-16 12:12:49.664995112 +0100
+-AC_CONFIG_FILES([Makefile Makefile-build hexedit.1])
++AC_CONFIG_FILES([Makefile Makefile-build hexedit.1 hexedit.lsm])
+ AC_OUTPUT
+Only in hexedit-1.6: configure.ac~
+Only in hexedit-1.6: configure.ac.orig
+Only in hexedit-1.6: configure.ac.rej
+diff -ur hexedit-1.6.old/hexedit.lsm.in hexedit-1.6/hexedit.lsm.in
+--- hexedit-1.6.old/hexedit.lsm.in	2022-04-22 09:06:10.000000000 +0100
++++ hexedit-1.6/hexedit.lsm.in	2022-05-02 22:30:07.618550082 +0100
 @@ -1,6 +1,6 @@
  Begin3
  Title:          hexedit
diff --git a/SPECS/hexedit.spec b/SPECS/hexedit.spec
index 7021656..24216c2 100644
--- a/SPECS/hexedit.spec
+++ b/SPECS/hexedit.spec
@@ -1,15 +1,18 @@
+%global forgeurl https://github.com/pixel/hexedit
+
+Version: 1.6
+%forgemeta
+
 Summary: A hexadecimal file viewer and editor
 Name: hexedit
-Version: 1.5
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
-
 URL: http://rigaux.org/hexedit.html
-Source: https://github.com/pixel/%{name}/archive/%{version}.tar.gz
+Source: %{forgesource}
 
 Patch1: hexedit-1.2.13-config.patch
 # Document --color option.  Sent upstream 2013-04-05.
-Patch2: hexedit-1.5.patch
+Patch2: hexedit-1.6-fix-lsm.patch
 
 BuildRequires: ncurses-devel
 BuildRequires: gcc
@@ -22,7 +25,7 @@ as the file is read a piece at a time. Hexedit can be used to modify the file
 and search through it.
 
 %prep
-%setup -q -n %{name}-%{version}
+%forgesetup
 
 %patch1 -p1 -b .config
 %patch2 -p1
@@ -44,6 +47,10 @@ make install \
 %{_mandir}/man1/hexedit.1*
 
 %changelog
+* Mon May 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
+- New upstream version 1.6
+  resolves: rhbz#2081103
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688