diff --git a/hexedit-1.2.13-config.patch b/hexedit-1.2.13-config.patch new file mode 100644 index 0000000..0421bcd --- /dev/null +++ b/hexedit-1.2.13-config.patch @@ -0,0 +1,23 @@ +diff -up hexedit/Makefile-build.in~ hexedit/Makefile-build.in +--- hexedit/Makefile-build.in~ 2008-11-07 17:50:57.000000000 +0200 ++++ hexedit/Makefile-build.in 2013-03-26 17:14:29.755829478 +0200 +@@ -23,7 +23,7 @@ FROMINFILES = hexedit-$(VERSION).lsm hex + dynamic: + $(MAKE) $(PRODUCT) + install -d -m 755 usr/bin +- install -s -m 755 $(PRODUCT) usr/bin ++ install -m 755 $(PRODUCT) usr/bin + 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 diff --git a/hexedit-1.2.2-config.patch b/hexedit-1.2.2-config.patch deleted file mode 100644 index 129db14..0000000 --- a/hexedit-1.2.2-config.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hexedit/Makefile.in.orig 2002-06-18 14:06:55.000000000 +0200 -+++ hexedit/Makefile.in 2002-06-18 14:08:29.000000000 +0200 -@@ -41,6 +41,6 @@ - - install: $(PRODUCT) - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -s -m 755 $(PRODUCT) $(bindir) -+ $(INSTALL) -m 755 $(PRODUCT) $(bindir) - $(INSTALL) -d -m 755 $(mandir)/man1 - $(INSTALL) -m 644 $(PRODUCT).1 $(mandir)/man1 ---- hexedit/Makefile-build.in.orig 2002-06-18 14:08:36.000000000 +0200 -+++ hexedit/Makefile-build.in 2002-06-18 14:09:37.000000000 +0200 -@@ -23,7 +23,7 @@ - dynamic: - $(MAKE) $(PRODUCT) - install -d -m 755 usr/bin -- install -s -m 755 $(PRODUCT) usr/bin -+ install -m 755 $(PRODUCT) usr/bin - install -d -m 755 usr/man/man1 - install -m 644 $(PRODUCT).1 usr/man/man1 - tar cfz $(DYNAMICBIN) usr diff --git a/hexedit.spec b/hexedit.spec index 7f5986d..fbf0082 100644 --- a/hexedit.spec +++ b/hexedit.spec @@ -1,12 +1,12 @@ Summary: A hexadecimal file viewer and editor Name: hexedit Version: 1.2.13 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Editors URL: http://rigaux.org/hexedit.html Source: http://rigaux.org/%{name}-%{version}.src.tgz -#Patch: hexedit-1.2.2-config.patch +Patch: hexedit-1.2.13-config.patch BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,7 +17,7 @@ and search through it. %prep %setup -q -n %{name} -#%patch -p1 -b .config +%patch -p1 -b .config %build %configure @@ -33,11 +33,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc hexedit-%{version}.lsm COPYING TODO Changes +%doc hexedit-%{version}.lsm COPYING Changes %{_bindir}/hexedit %{_mandir}/*/* %changelog +* Tue Mar 26 2013 Ville Skyttä - 1.2.13-2 +- Bring back config patch to fix -debuginfo, it hasn't been upstreamed yet. +- Drop empty TODO from docs. + * Thu Mar 21 2013 Jon Ciesla - 1.2.13-1 - Latest upstream. - Config patch upstreamed.