delete -S git from %autosetup, and delete BuildRequires git

Conflicts:
	file.spec
This commit is contained in:
chenyanpanHW 2021-07-30 22:37:34 +08:00 committed by zhanchengbin
parent 6bb6650f9e
commit b9377edee6
2 changed files with 6 additions and 6 deletions

View File

@ -61,7 +61,4 @@ index 1437bcc..b609dd1 100644
if (map == NULL)
--
1.8.3.1
<<<<<<< HEAD:0001-file-localmagic.patch
=======
>>>>>>> 68b4b5a... file: update to 5.39 version:0001-file-localmagic.patch

View File

@ -1,6 +1,6 @@
Name: file
Version: 5.39
Release: 4
Release: 6
Summary: A tool to identify the type of a particular file type
License: BSD
URL: http://www.darwinsys.com/file/
@ -10,7 +10,7 @@ Patch1: 0001-file-localmagic.patch
Patch2: 0002-improve-detection-of-static-pie-binaries.patch
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: autoconf automake libtool git zlib-devel
BuildRequires: autoconf automake libtool zlib-devel
%description
The program checks to see if the file is empty,or if
@ -66,7 +66,7 @@ This package contains the Python 3 bindings to access to the libmagic
API. The libmagic library is also used by the familiar file(1) command.
%prep
%autosetup -p1 -S git
%autosetup -p1
iconv doc/libmagic.man -f iso-8859-1 -t utf-8 -o doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -153,6 +153,9 @@ make check
%{python3_sitelib}/__pycache__/*
%changelog
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 5.39-6
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Mon Aug 24 2020 lihaotian <lihaotian9@huawei.com> - 5.39-4
- improve detection of static-pie binaries