- recreate link in pretrans, hopefully solves broken upgrades; rel 3

[packages/file.git] / file.spec

diff --git a/file.spec b/file.spec
index 92ce81bd30ad55fec76ba70d42869f3d14b802d6..20324b6a9225479ae3137707eb5697c315d3cb1a 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -1,5 +1,3 @@
-# TODO
-# - bug: java .class files aren't recognized
 #
 # Conditional build:
 %bcond_without python          # don't build python-magic module
@@ -30,13 +28,13 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):  判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
-Version:       4.26
-Release:       4
+Version:       5.03
+Release:       3
 License:       distributable
 Group:         Applications/File
 URL:           http://www.darwinsys.com/file/
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 74cd5466416136da30a4e69f74dbc7a0
+# Source0-md5: d05f08a53e5c2f51f8ee6a4758c0cc53
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: c157a183b64156f8baafaefd9cbf04c1
 Source2:       %{name}-zisofs.magic
@@ -49,7 +47,6 @@ Patch3:               %{name}-greedy-dump.patch
 Patch4:                %{name}-selinux.patch
 Patch5:                %{name}-msdos.patch
 Patch6:                %{name}-fusecompress.patch
-Patch7:                %{name}-javaclass.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -256,7 +253,6 @@ Wiązania Pythona dla libmagic.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 rm -f magic/Magdir/{*.orig,*~}
 
@@ -303,8 +299,8 @@ cd ..
 
 install -D magic/Localstuff $RPM_BUILD_ROOT%{_sysconfdir}/magic
 
-cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} >$RPM_BUILD_ROOT%{_datadir}/file/magic
-awk -f %{SOURCE4} <$RPM_BUILD_ROOT%{_datadir}/file/magic >$RPM_BUILD_ROOT%{_datadir}/file/magic.mime
+cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} >$RPM_BUILD_ROOT%{_datadir}/misc/magic
+awk -f %{SOURCE4} <$RPM_BUILD_ROOT%{_datadir}/misc/magic >$RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -314,7 +310,9 @@ sed -e 's/MAGIC 4/MAGIC 5/' $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.4 \
        > $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.5
 rm -f $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.4
 
-src/file -m $RPM_BUILD_ROOT%{_datadir}/file/magic -c -C
+src/file -m $RPM_BUILD_ROOT%{_datadir}/misc/magic -c -C
+
+ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
 rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
@@ -325,11 +323,24 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n libmagic -p /sbin/ldconfig
 %postun        -n libmagic -p /sbin/ldconfig
 
+%pretrans
+# it used to be directory
+if [ -d %{_datadir}/file ]; then
+       mv -b %{_datadir}/file{,.dir}
+       ln -s misc %{_datadir}/file
+%banner -e %{name} <<EOF
+Check %{_datadir}/file.dir for your own files and remove it when done.
+EOF
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog COPYING README
 %attr(755,root,root) %{_bindir}/file
 %{_datadir}/file
+%{_datadir}/misc/magic
+%{_datadir}/misc/magic.mgc
+%{_datadir}/misc/magic.mime
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/magic
 %{_mandir}/man1/file.1*
 %{_mandir}/man5/magic.5*