Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/hexedit.git#e4259e50735cf57fd7832d6d83085acb16e825ea
This commit is contained in:
DistroBaker
parent
afae08954c
commit
851f29da86
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
hexedit-1.2.12.src.tgz
|
||||
/hexedit-1.2.13.src.tgz
|
||||
/1.5.tar.gz
|
||||
|
||||
@ -10,14 +10,3 @@ diff -up hexedit/Makefile-build.in~ hexedit/Makefile-build.in
|
||||
install -d -m 755 usr/man/man1
|
||||
install -m 644 $(PRODUCT).1 usr/man/man1
|
||||
tar cfz $(DYNAMICBIN) usr
|
||||
diff -up hexedit/Makefile.in~ hexedit/Makefile.in
|
||||
--- hexedit/Makefile.in~ 2010-02-04 17:20:52.000000000 +0200
|
||||
+++ hexedit/Makefile.in 2013-03-26 17:14:26.217769520 +0200
|
||||
@@ -42,6 +42,6 @@ distclean: clean
|
||||
|
||||
install: $(PRODUCT)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
|
||||
- $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir)
|
||||
+ $(INSTALL) -m 755 $(PRODUCT) $(DESTDIR)$(bindir)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
|
||||
$(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1
|
||||
|
||||
43
hexedit-1.5.patch
Normal file
43
hexedit-1.5.patch
Normal file
@ -0,0 +1,43 @@
|
||||
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 @@
|
||||
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"
|
||||
AC_SUBST(PRODUCT)
|
||||
AC_SUBST(VERSION)
|
||||
AC_SUBST(INCL)
|
||||
@@ -72,4 +72,4 @@
|
||||
#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
|
||||
@@ -1,6 +1,6 @@
|
||||
Begin3
|
||||
Title: hexedit
|
||||
-Version: TheVERSION
|
||||
+Version: @VERSION@
|
||||
Entered-date: 10SEP98
|
||||
Description: view and edit files in hexadecimal or in ASCII.
|
||||
hexedit shows a file both in ASCII and in hexadecimal.
|
||||
@@ -13,8 +13,8 @@
|
||||
Author: pixel@rigaux.org (Pixel)
|
||||
Maintained-by: pixel@rigaux.org (Pixel)
|
||||
Primary-site: sunsite.unc.edu /pub/Linux/utils/file/hex
|
||||
- 39kB hexedit-VERSION.src.tgz
|
||||
- 14kB hexedit-VERSION.bin.i386.dynamic.tgz
|
||||
+ 39kB hexedit-@VERSION@.src.tgz
|
||||
+ 14kB hexedit-@VERSION@.bin.i386.dynamic.tgz
|
||||
Original-site: rigaux.org /
|
||||
Platforms: Linux Unix SunOS Solaris SGI curses
|
||||
Copying-policy: GPL
|
||||
@ -1,13 +0,0 @@
|
||||
--- hexedit.old/hexedit.1 2013-03-01 22:07:04.000000000 +0000
|
||||
+++ hexedit/hexedit.1 2013-04-05 17:25:48.875705378 +0100
|
||||
@@ -17,6 +17,10 @@
|
||||
.I "\-m, \-\-maximize"
|
||||
Try to maximize the display.
|
||||
.TP
|
||||
+.I "\-\-color"
|
||||
+Display colors.
|
||||
+This feature is only available if your operating system supports it.
|
||||
+.TP
|
||||
.I "\-h, \-\-help"
|
||||
Show the usage.
|
||||
.SH COMMANDS (quickly)
|
||||
21
hexedit.spec
21
hexedit.spec
@ -1,19 +1,20 @@
|
||||
Summary: A hexadecimal file viewer and editor
|
||||
Name: hexedit
|
||||
Version: 1.2.13
|
||||
Release: 19%{?dist}
|
||||
Version: 1.5
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
|
||||
URL: http://rigaux.org/hexedit.html
|
||||
Source: http://rigaux.org/%{name}-%{version}.src.tgz
|
||||
Source: https://github.com/pixel/%{name}/archive/%{version}.tar.gz
|
||||
|
||||
Patch1: hexedit-1.2.13-config.patch
|
||||
# Document --color option. Sent upstream 2013-04-05.
|
||||
Patch2: hexedit-man-page-color.patch
|
||||
Patch2: hexedit-1.5.patch
|
||||
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
BuildRequires: autoconf
|
||||
|
||||
%description
|
||||
Hexedit shows a file both in ASCII and in hexadecimal. The file can be a device
|
||||
@ -21,12 +22,13 @@ 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}
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
%patch1 -p1 -b .config
|
||||
%patch2 -p1 -b .color
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%configure
|
||||
make %{_smp_mflags}
|
||||
|
||||
@ -37,11 +39,16 @@ make install \
|
||||
INSTALL='install -p'
|
||||
|
||||
%files
|
||||
%doc hexedit-%{version}.lsm COPYING Changes
|
||||
%doc hexedit.lsm COPYING Changes
|
||||
%{_bindir}/hexedit
|
||||
%{_mandir}/man1/hexedit.1*
|
||||
|
||||
%changelog
|
||||
* Tue Mar 16 2021 Filip Januš <fjanus@redhat.com> - 1.5-1
|
||||
- Nwe upstream version 1.5
|
||||
- Add patch to solve inconsistency between configure.ac and filename
|
||||
- Add Build requirement autoconf
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user