file 5.14-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8236 ec354946-7b23-47d6-9f5a-488ba84defc7

f/file/file-vl.spec

@@ -5,11 +5,11 @@
 Summary: A utility for determining file types.
 Summary(ja): ファイルの種類を判別するユーティリティー
 Name: file
-Version: 5.11
+Version: 5.14
 Release: 1%{?_dist_release}
-
 License: BSD
 Group: Applications/System
+Obsoletes: file-static
 
 Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
 
@@ -19,15 +19,22 @@ Source10: magic.printer-j
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
 # sent upstream - should be included in next upstream release
-Patch1: file-tnef.patch
-Patch2: file-5.10-strength.patch
-Patch3: file-5.10-sticky-bit.patch
-Patch4: file-python-func.patch
-Patch5: file-qed-vdi-image.patch
-Patch6: file-5.11-ia64-swap.patch
-Patch7: file-4.17-rpm-name.patch
-Patch8: file-5.11-magicmgc-home.patch
-Patch9: file-5.11-compress.patch
+Patch1: file-5.10-strength.patch
+Patch2: file-5.10-sticky-bit.patch
+Patch3: file-4.17-rpm-name.patch
+Patch4: file-5.04-volume_key.patch
+Patch5: file-5.04-man-return-code.patch
+Patch6: file-5.04-generic-msdos.patch
+Patch7: file-5.14-x86boot.patch
+Patch8: file-5.14-perl.patch
+Patch9: file-5.14-elfspace.patch
+Patch10: file-5.14-bad-fsmagic-space.patch
+Patch11: file-5.14-no-magic.patch
+Patch12: file-5.14-journald.patch
+Patch13: file-5.14-magic_load.patch
+
+#Vine
+Patch100: file-5.14-magicbuild-fix.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
@@ -64,16 +71,6 @@ Requires: %{name} = %{version}-%{release}
 The file-devel package contains the header files and libmagic library
 necessary for developing programs using libmagic.
 
-%package static
-Summary: Static library for file development
-Summary(ja): libmagic のスタティックライブラリ
-Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description static
-The file-static package contains the static version of
-the libmagic library.
-
 %package -n python-magic
 Summary: Python bindings for the libmagic API
 Group:   Development/Libraries
@@ -88,7 +85,7 @@ file(1) command.
 
 %prep
 %setup -q
-
+# Don't use -b -- it will lead to poblems when compiling magic file!
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -99,6 +96,13 @@ file(1) command.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+
+#Vine
+%patch100 -p1
 
 cat %{SOURCE10} >> ./magic/Localstuff
 
@@ -107,7 +111,7 @@ touch -r doc/libmagic.man doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
 
 %build
-#autoreconf
+autoreconf
 CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
 %configure --enable-fsect-man5 --disable-rpath
 # remove hardcoded library paths from local libtool
@@ -178,10 +182,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/magic.h
 %{_mandir}/man3/*
 
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/*.a
-
 %files -n python-magic
 %defattr(-, root, root, -)
 %doc python/README COPYING python/example.py
@@ -192,6 +192,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 22 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-1
+- new upstream reelase 
+- add patch100 to fix build error
+- remove -static subpackage and add Obs: file-static
+- fix old changelog date...
+
 * Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 5.11-1
 - new upstream reelase
 - drop all local patches
@@ -312,7 +318,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 27 1999 Norihito Ohmori <ohmori@flatout.org>
 - patch  dues not apply bug.
 
-* Wed Aug 26 1999 Norihito Ohmori <ohmori@flatout.org>
+* Thu Aug 26 1999 Norihito Ohmori <ohmori@flatout.org>
 - not need kcc (Thanks for Toru Hoshina <hoshina@best.com>)
 - ASCII data and Shift JIS data detected in Japanese Text Detection bug fix.