diff --git a/1.5.tar.gz b/1.5.tar.gz deleted file mode 100644 index d2b3f0c0e6ac19dd6f10caf1bae5623369615783..0000000000000000000000000000000000000000 Binary files a/1.5.tar.gz and /dev/null differ diff --git a/hexedit-1.5.patch b/hexedit-1.6-fix-lsm.patch similarity index 60% rename from hexedit-1.5.patch rename to hexedit-1.6-fix-lsm.patch index de3431e81215c89bdc5b79ce0b5cbfbafc0ee847..ec18b362141cdf3d5507db3fe035221bcd664076 100644 --- a/hexedit-1.5.patch +++ b/hexedit-1.6-fix-lsm.patch @@ -1,27 +1,29 @@ Author:Filip Januš 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~ +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/hexedit-1.6.tar.gz b/hexedit-1.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..06bf4b1a796515e17d71687dfd7252ca993b3d65 Binary files /dev/null and b/hexedit-1.6.tar.gz differ diff --git a/hexedit.spec b/hexedit.spec index 01b32a687efec2b83c870cdd6f515990ccebfbc2..d1b73446c16ab4b23e781f9aacacbfedcf09b08d 100644 --- a/hexedit.spec +++ b/hexedit.spec @@ -1,17 +1,17 @@ Name: hexedit -Version: 1.5 +Version: 1.6 Release: 1 Summary: hexedit - view and edit files in hexadecimal or in ASCII. License: GPLv2+ URL: http://rigaux.org/hexedit.html -Source: https://github.com/pixel/%{name}/archive/%{version}.tar.gz +Source: https://github.com/pixel/%{name}/archive/%{name}-%{version}.tar.gz -Patch0: hexedit-1.2.13-config.patch -Patch1: hexedit-1.5.patch +Patch1: hexedit-1.2.13-config.patch +Patch2: hexedit-1.6-fix-lsm.patch BuildRequires: gcc ncurses-devel -BuildRequires: autoconf +BuildRequires: autoconf make %description hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as @@ -20,7 +20,10 @@ the file is read a piece at a time. You can modify the file and search through i %package_help %prep -%autosetup -n %{name}-%{version} -p1 +%forgesetup + +%patch1 -p1 -b .config +%patch2 -p1 %build ./autogen.sh @@ -28,17 +31,11 @@ the file is read a piece at a time. You can modify the file and search through i %make_build %install -%make_install INSTALL='install -p' - -%check - -%pre - -%preun - -%post - -%postun +#%make_install INSTALL='install -p' +make install \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + bindir=$RPM_BUILD_ROOT%{_bindir} \ + INSTALL='install -p' %files %doc %{name}.lsm Changes @@ -49,6 +46,9 @@ the file is read a piece at a time. You can modify the file and search through i %{_mandir}/man1/hexedit.1* %changelog +* Fri Feb 17 2023 li-long315 - 1.6.1 +- Upgrade to 1.6 + * Wed Jun 22 2022 dillon chen - 1.5-1 - update to 1.5