commit ee8f30d2775694fd402e7a748b5670a7a4d1c50d
Author: Elan Ruusamäe <[email protected]>
Date: Thu Sep 26 14:49:46 2013 +0300
up to 5.15
file.spec | 6 ++----
sticky-bit.patch | 14 --------------
2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/file.spec b/file.spec
index 8197bcd..e7a0a0b 100644
--- a/file.spec
+++ b/file.spec
@@ -28,12 +28,12 @@ Summary(uk.UTF-8): Утиліта для визначення типів фай
Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
-Version: 5.14
+Version: 5.15
Release: 1
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: c26625f1d6773ad4bc5a87c0e315632c
+# Source0-md5: 3f99565532f548d7540912c4642d1ede
Source1:
http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
Source2: %{name}-zisofs.magic
@@ -43,7 +43,6 @@ Patch0: %{name}-sparc.patch
Patch1: %{name}-selinux.patch
Patch2: searchpath.patch
Patch3: automake.patch
-Patch4: sticky-bit.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -251,7 +250,6 @@ Wiązania Pythona dla libmagic.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%if "%{cc_version}" < "3.4"
%{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/sticky-bit.patch b/sticky-bit.patch
deleted file mode 100644
index fd3b9ad..0000000
--- a/sticky-bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://mx.gw.com/pipermail/file/2012/000908.html
-
-diff --git a/src/ascmagic.c b/src/ascmagic.c
-index 5a1caac..8d6ca95 100644
---- a/src/ascmagic.c
-+++ b/src/ascmagic.c
-@@ -211,6 +211,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const
unsigned char *buf,
- case 0:
- if (file_printf(ms, ", ") == -1)
- goto done;
-+ break;
- case -1:
- goto done;
- default:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/ee8f30d2775694fd402e7a748b5670a7a4d1c50d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
