diff --git a/.gitignore b/.gitignore index e69de29..59a300e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/bvi-1.3.2.src.tar.gz diff --git a/bvi-1.3.2-fix_help_install.patch b/bvi-1.3.2-fix_help_install.patch new file mode 100644 index 0000000..940a53f --- /dev/null +++ b/bvi-1.3.2-fix_help_install.patch @@ -0,0 +1,47 @@ +diff -up bvi-1.3.2/Makefile.in.orig bvi-1.3.2/Makefile.in +--- bvi-1.3.2/Makefile.in.orig 2011-12-09 12:26:03.815956438 +0100 ++++ bvi-1.3.2/Makefile.in 2011-12-09 12:42:31.570909173 +0100 +@@ -26,6 +26,7 @@ exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + mandir = $(DESTDIR)@mandir@ + libdir = $(DESTDIR)@libdir@ ++helpdir = $(DESTDIR)@datadir@/bvi + + man1dir = $(mandir)/man1 + +@@ -58,7 +59,7 @@ bmore: $(BMOBJ) + $(CC) $(CFLAGS) $(DEFS) -c $< + + bmore.o: bmore.c +- $(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(libdir)/bmore.help\" -c $< ++ $(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(helpdir)/bmore.help\" -c $< + + + install: all installdirs +@@ -66,14 +67,14 @@ install: all installdirs + @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir) + @$(INSTALL_PROGRAM) bvi $(bindir) + @$(INSTALL_PROGRAM) bmore $(bindir) +- @$(INSTALL_DATA) bmore.help $(libdir) ++ @$(INSTALL_DATA) bmore.help $(helpdir) + @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi + @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi + @ln $(bindir)/bvi $(bindir)/bview + @ln $(bindir)/bvi $(bindir)/bvedit + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(man1dir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(helpdir) $(man1dir) + + uninstall: + @echo "Uninstalling bvi" +@@ -81,7 +82,7 @@ uninstall: + @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi + @if [ -f $(bindir)/bvi ]; then rm $(bindir)/bvi; fi + @if [ -f $(bindir)/bmore ]; then rm $(bindir)/bmore; fi +- @if [ -f $(libdir)/bmore.help ]; then rm $(libdir)/bmore.help; fi ++ @if [ -f $(helpdir)/bmore.help ]; then rm $(helpdir)/bmore.help; fi + @if [ -f $(man1dir)/bvi.1 ]; then rm $(man1dir)/bvi.1; fi + @if [ -f $(man1dir)/bmore.1 ]; then rm $(man1dir)/bmore.1; fi + + diff --git a/bvi-1.3.2-no_strip.patch b/bvi-1.3.2-no_strip.patch new file mode 100644 index 0000000..937eca6 --- /dev/null +++ b/bvi-1.3.2-no_strip.patch @@ -0,0 +1,14 @@ +diff -up bvi-1.3.2/Makefile.in.orig bvi-1.3.2/Makefile.in +--- bvi-1.3.2/Makefile.in.orig 2003-07-03 14:55:22.000000000 +0200 ++++ bvi-1.3.2/Makefile.in 2011-12-09 12:22:12.142274874 +0100 +@@ -64,8 +64,8 @@ bmore.o: bmore.c + install: all installdirs + @echo "Installing bvi" + @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir) +- @$(INSTALL_PROGRAM) -s bvi $(bindir) +- @$(INSTALL_PROGRAM) -s bmore $(bindir) ++ @$(INSTALL_PROGRAM) bvi $(bindir) ++ @$(INSTALL_PROGRAM) bmore $(bindir) + @$(INSTALL_DATA) bmore.help $(libdir) + @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi + @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi diff --git a/bvi.spec b/bvi.spec new file mode 100644 index 0000000..85c47c8 --- /dev/null +++ b/bvi.spec @@ -0,0 +1,71 @@ +Name: bvi +Version: 1.3.2 +Release: 6%{?dist} +Summary: Display-oriented editor for binary files + +License: GPLv2+ +URL: http://bvi.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz + +# Fix empty debuginfo package : +Patch0: %{name}-1.3.2-no_strip.patch +# Move from /usr/lib64/bmore.help to /usr/share/bvi/bmore.help : +Patch1: %{name}-1.3.2-fix_help_install.patch + +BuildRequires: ncurses-devel +#Requires: + +%description +The bvi is a display-oriented editor for binary files, based +on the vi text-editor. If you are familiar with vi, just start +the editor and begin to edit! A bmore program is also +included in the package. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +# Fix the path of the bmore.help file specified in the man page : +sed -i "s@/usr/local/share/bmore.help@/usr/share/bvi/bmore.help@" ./bmore.1 + +%build +%configure +make %{?_smp_mflags} + + +%install +make install DESTDIR=%{buildroot} + + +%files +%doc README COPYING CREDITS CHANGES +%{_bindir}/%{name} +%{_bindir}/bmore +%{_bindir}/bvedit +%{_bindir}/bview +%{_datadir}/%{name}/ +%{_mandir}/man1/*.1.* + + +%changelog +* Sat Jan 07 2012 Matthieu Saulnier - 1.3.2-6 +- fix license in spec file + +* Sat Dec 24 2011 Matthieu Saulnier - 1.3.2-5 +- remove version macro in patches names +- cleanup sed statement + +* Wed Dec 21 2011 Matthieu Saulnier - 1.3.2-4 +- add comments for patches +- fix path of bmore.help specified in man page by sed + +* Sun Dec 11 2011 Matthieu Saulnier - 1.3.2-3 +- add patch to fix empty debuginfo package +- add patch to move help file + +* Wed Dec 09 2011 Matthieu Saulnier - 1.3.2-2 +- fix broken help function + +* Thu Dec 08 2011 Matthieu Saulnier - 1.3.2-1 +- Initial Release diff --git a/sources b/sources index e69de29..2dd55ec 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4257305ffb27177a6d5208b2df4ca92d bvi-1.3.2.src.tar.gz