From: Jakub Bogusz Date: Sat, 5 Jan 2013 18:30:41 +0000 (+0100) Subject: - updated to 5.12 X-Git-Tag: auto/th/file-5.12-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffile.git;a=commitdiff_plain;h=49d7bd2c95292eef6735529cabe38f43d0e8deca;hp=235d99d4ae0c3a926fab4d7d8f9e022268e14858 - updated to 5.12 - updated sparc,searchpath patches - removed obsolete nodejs patch --- diff --git a/file-sparc.patch b/file-sparc.patch index 38fb6e1..aeb121e 100644 --- a/file-sparc.patch +++ b/file-sparc.patch @@ -26,17 +26,16 @@ diff -Nru file-4.02.bak/magic/Magdir/bsdi file-4.02/magic/Magdir/bsdi >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -diff -Nru file-4.02.bak/magic/Magdir/mach file-4.02/magic/Magdir/mach ---- file-4.02.bak/magic/Magdir/mach Sun Feb 14 18:16:20 1999 -+++ file-4.02/magic/Magdir/mach Thu Apr 3 09:14:25 2003 -@@ -34,7 +34,7 @@ - >4 belong 11 hp pa-risc - >4 belong 12 acorn - >4 belong 13 m88k +--- file-5.12/magic/Magdir/mach.orig 2013-01-05 18:01:15.529528408 +0100 ++++ file-5.12/magic/Magdir/mach 2013-01-05 18:05:58.686189172 +0100 +@@ -76,7 +76,7 @@ + >>8 belong 0 mc88000 + >>8 belong 1 mc88100 + >>8 belong 2 mc88110 ->4 belong 14 sparc +>4 belong 14 SPARC - >4 belong 15 i860-big - >4 belong 16 i860 + >4 belong 15 i860g + >4 belong 16 alpha >4 belong 17 rs6000 diff -Nru file-4.02.bak/magic/Magdir/netbsd file-4.02/magic/Magdir/netbsd --- file-4.02.bak/magic/Magdir/netbsd Tue Apr 1 01:53:37 2003 diff --git a/file.spec b/file.spec index 8326b7c..4d0ad0e 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.11 -Release: 3 +Version: 5.12 +Release: 1 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz -# Source0-md5: 16a407bd66d6c7a832f3a5c0d609c27b +# Source0-md5: 1d7d85cb9354f79e5e351deef36be6ba Source1: http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b Source2: %{name}-zisofs.magic @@ -43,18 +43,18 @@ Patch0: %{name}-sparc.patch Patch1: %{name}-selinux.patch Patch2: searchpath.patch Patch3: automake.patch -Patch4: nodejs.patch -Patch5: sticky-bit.patch +Patch4: sticky-bit.patch URL: http://www.darwinsys.com/file/ BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: libtool +BuildRequires: libtool >= 2:2.0 BuildRequires: rpmbuild(macros) >= 1.453 %if %{with python} BuildRequires: python-devel BuildRequires: python-modules BuildRequires: rpm-pythonprov %endif +BuildRequires: zlib-devel Requires: libmagic = %{version}-%{release} Conflicts: rpm-build < 4.4.1-9 Conflicts: xdelta < 1.0.0 @@ -202,6 +202,7 @@ Summary: Header files for libmagic library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libmagic Group: Development/Libraries Requires: libmagic = %{version}-%{release} +Requires: zlib-devel %description -n libmagic-devel Library of functions which operate on magic database file. @@ -251,7 +252,6 @@ Wiązania Pythona dla libmagic. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %if "%{cc_version}" < "3.4" %{__sed} -i -e 's,-Wextra,,' configure.ac @@ -270,7 +270,7 @@ rm -f magic/Magdir/{*.orig,*~} %{__automake} %configure \ --enable-fsect-man5 \ - %{!?with_static_libs:--enable-static=no} + %{?with_static_libs:--enable-static} %{__make} diff --git a/nodejs.patch b/nodejs.patch deleted file mode 100644 index 5eff974..0000000 --- a/nodejs.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3a7c447b560eda64bb19020f5e13639841ae6f64 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= -Date: Sat, 16 Jun 2012 15:36:19 +0300 -Subject: [PATCH] add recognizing of node.js script shebangs - ---- - magic/Magdir/javascript | 17 +++++++++++++++++ - magic/Makefile.am | 1 + - 2 files changed, 18 insertions(+) - create mode 100644 magic/Magdir/javascript - -diff --git a/magic/Magdir/javascript b/magic/Magdir/javascript -new file mode 100644 -index 0000000..ad585c7 ---- /dev/null -+++ b/magic/Magdir/javascript -@@ -0,0 +1,17 @@ -+#------------------------------------------------------------------------------ -+# $File: $ -+# javascript: magic for javascript and node.js scripts. -+# -+0 search/1/w #!/bin/node Node.js script text executable -+!:mime application/javascript -+0 search/1/w #!/usr/bin/node Node.js script text executable -+!:mime application/javascript -+0 search/1/w #!/bin/nodejs Node.js script text executable -+!:mime application/javascript -+0 search/1/w #!/usr/bin/nodejs Node.js script text executable -+!:mime application/javascript -+ -+0 search/1 #!/usr/bin/env\ node Node.js script text executable -+!:mime application/javascript -+0 search/1 #!/usr/bin/env\ nodejs Node.js script text executable -+!:mime application/javascript -diff --git a/magic/Makefile.am b/magic/Makefile.am -index 23c4269..c3e1365 100644 ---- a/magic/Makefile.am -+++ b/magic/Makefile.am -@@ -106,6 +106,7 @@ $(MAGIC_FRAGMENT_DIR)/island \ - $(MAGIC_FRAGMENT_DIR)/ispell \ - $(MAGIC_FRAGMENT_DIR)/isz \ - $(MAGIC_FRAGMENT_DIR)/java \ -+$(MAGIC_FRAGMENT_DIR)/javascript \ - $(MAGIC_FRAGMENT_DIR)/jpeg \ - $(MAGIC_FRAGMENT_DIR)/karma \ - $(MAGIC_FRAGMENT_DIR)/kde \ --- -1.7.10.1 - diff --git a/searchpath.patch b/searchpath.patch index 0bd0937..214d737 100644 --- a/searchpath.patch +++ b/searchpath.patch @@ -1,15 +1,15 @@ still search in /etc/magic still use ~/.magic by default ---- file-5.04/src/Makefile.am 2010-07-21 18:56:10.000000000 +0300 -+++ file-5.04/src/Makefile.am 2010-12-23 13:27:13.810960488 +0200 +--- file-5.12/src/Makefile.am.orig 2013-01-05 18:06:28.459521884 +0100 ++++ file-5.12/src/Makefile.am 2013-01-05 18:07:08.582854382 +0100 @@ -4,7 +4,7 @@ bin_PROGRAMS = file -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"' - AM_CFLAGS = @WARNINGS@ + AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \ --- file-5.06/src/magic.c~ 2011-04-07 22:20:30.000000000 +0300