Upgrade to 1.6

This commit is contained in:
li-long315 2023-02-17 16:07:42 +08:00
parent 8230a10b11
commit 8b7146aa3e
4 changed files with 31 additions and 29 deletions

Binary file not shown.

View File

@ -1,27 +1,29 @@
Author:Filip Januš <fjanus@redhat.com> Author:Filip Januš <fjanus@redhat.com>
This patch fixs inconsistency between filename and configure.ac This patch fixs inconsistency between filename and configure.ac
diff -ur hexedit-1.5/configure.ac hxpatch/configure.ac diff -ur hexedit-1.6.old/configure.ac hexedit-1.6/configure.ac
--- hexedit-1.5/configure.ac 2020-08-28 11:51:07.000000000 +0200 --- hexedit-1.6.old/configure.ac 2022-04-22 09:06:10.000000000 +0100
+++ hxpatch/configure.ac 2021-03-16 15:37:40.127591071 +0100 +++ hexedit-1.6/configure.ac 2022-05-02 22:30:54.942894809 +0100
@@ -14,7 +14,7 @@ @@ -15,7 +15,7 @@
VERSION=TheVERSION VERSION=TheVERSION
INCL=hexedit.h INCL=hexedit.h
SRCS="hexedit.c display.c mark.c page.c file.c interact.c misc.c search.c" 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-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.in 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(PRODUCT)
AC_SUBST(VERSION) AC_SUBST(VERSION)
AC_SUBST(INCL) AC_SUBST(INCL)
@@ -72,4 +72,4 @@ @@ -74,5 +74,5 @@
#endif #endif
) )
-AC_OUTPUT(Makefile Makefile-build hexedit.1) -AC_CONFIG_FILES([Makefile Makefile-build hexedit.1])
+AC_OUTPUT(Makefile Makefile-build hexedit.1 hexedit.lsm) +AC_CONFIG_FILES([Makefile Makefile-build hexedit.1 hexedit.lsm])
diff -ur hexedit-1.5/hexedit.lsm.in hxpatch/hexedit.lsm.in AC_OUTPUT
--- hexedit-1.5/hexedit.lsm.in 2020-08-28 11:51:07.000000000 +0200 Only in hexedit-1.6: configure.ac~
+++ hxpatch/hexedit.lsm.in 2021-03-16 12:12:49.664995112 +0100 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 @@ @@ -1,6 +1,6 @@
Begin3 Begin3
Title: hexedit Title: hexedit

BIN
hexedit-1.6.tar.gz Normal file

Binary file not shown.

View File

@ -1,17 +1,17 @@
Name: hexedit Name: hexedit
Version: 1.5 Version: 1.6
Release: 1 Release: 1
Summary: hexedit - view and edit files in hexadecimal or in ASCII. Summary: hexedit - view and edit files in hexadecimal or in ASCII.
License: GPLv2+ License: GPLv2+
URL: http://rigaux.org/hexedit.html 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.2.13-config.patch
Patch1: hexedit-1.5.patch Patch2: hexedit-1.6-fix-lsm.patch
BuildRequires: gcc ncurses-devel BuildRequires: gcc ncurses-devel
BuildRequires: autoconf BuildRequires: autoconf make
%description %description
hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as 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 %package_help
%prep %prep
%autosetup -n %{name}-%{version} -p1 %forgesetup
%patch1 -p1 -b .config
%patch2 -p1
%build %build
./autogen.sh ./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 %make_build
%install %install
%make_install INSTALL='install -p' #%make_install INSTALL='install -p'
make install \
%check mandir=$RPM_BUILD_ROOT%{_mandir} \
bindir=$RPM_BUILD_ROOT%{_bindir} \
%pre INSTALL='install -p'
%preun
%post
%postun
%files %files
%doc %{name}.lsm Changes %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* %{_mandir}/man1/hexedit.1*
%changelog %changelog
* Fri Feb 17 2023 li-long315 <lilong@kylinos.cn> - 1.6.1
- Upgrade to 1.6
* Wed Jun 22 2022 dillon chen <dillon.chen@gmail.com> - 1.5-1 * Wed Jun 22 2022 dillon chen <dillon.chen@gmail.com> - 1.5-1
- update to 1.5 - update to 1.5