From 687fcecb71542d7f0cabde5e50458399eaa5d9de14cf29f9d8de76ec32b2d422 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 15 Sep 2015 18:49:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:tools/binwalk?expand=0&rev=8 --- binwalk.changes | 8 +++----- binwalk.spec | 6 ------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/binwalk.changes b/binwalk.changes index 1f76a4d..edf747a 100644 --- a/binwalk.changes +++ b/binwalk.changes @@ -4,12 +4,10 @@ Mon Sep 14 10:56:52 UTC 2015 - sor.alexei@meowr.ru - Use Python 3.x in new openSUSE releases. - Use built-in pyqtgraph. - Require "file" instead of python-magic as a shadow ABI-agnostic - libmagic dependency. -- Avoid depending on library specific ABI by depending on ssdeep - instead of libfuzzy2. + libmagic dependency and "ssdeep" instead of "libfuzzy2". - Dependencies fixes. -- Remove pregenerated binwalk.1: leave old openSUSE releases - without a manpage. +- Remove manpage generation from "binwalk --help": sometimes it + makes package build to fail. - Spec cleanup. ------------------------------------------------------------------- diff --git a/binwalk.spec b/binwalk.spec index 4e54a44..e871e24 100644 --- a/binwalk.spec +++ b/binwalk.spec @@ -36,8 +36,6 @@ Recommends: xz Recommends: zlib Suggests: java %if 0%{?suse_version} >= 1230 -BuildRequires: help2man -BuildRequires: python3-curses BuildRequires: python3-devel Requires: python3-curses # Depends on libfuzzy. @@ -75,9 +73,6 @@ make %{?_smp_mflags} %install %if 0%{?suse_version} >= 1230 python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} - -help2man -N --version-string=%{version} %{buildroot}%{_bindir}/%{name} > %{name}.1 -install -Dm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %else python2 setup.py install --root=%{buildroot} --prefix=%{_prefix} %endif @@ -88,7 +83,6 @@ python2 setup.py install --root=%{buildroot} --prefix=%{_prefix} %if 0%{?suse_version} >= 1230 %{python3_sitelib}/%{name}/ %{python3_sitelib}/%{name}-* -%{_mandir}/man?/%{name}.?%{?ext_man} %else %{python_sitelib}/%{name}/ %{python_sitelib}/%{name}-*