- move libmagic to /{_lib}.

[packages/file.git] / file.spec

diff --git a/file.spec b/file.spec
index acd165c103d6cb35f8f531de1a6cf8b5e235a594..5bea540c6b3c51c82a155143d3e72af308ca4929 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -27,25 +27,24 @@ Summary(uk):        
 Summary(zh_CN):        Åж¨ÎļþÀàÐ͵Ť¾ß¡£
 Summary(zh_TW):        ¥Î©ó¨M©wÀÉ®×Ãþ«¬ªº¤@­Ó¤u¨ãµ{¦¡¡C
 Name:          file
-Version:       4.14
-Release:       1
+Version:       4.15
+Release:       2
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 66983e60087e8bcd588c8ab38a861af0
+# Source0-md5: 09a6603dadbe06e577e98a2547201fab
 Source1:       zisofs.magic
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5: c157a183b64156f8baafaefd9cbf04c1
 Source3:       %{name}-magic.mscompress
 Patch0:                %{name}-debian.patch
 Patch1:                %{name}-sparc.patch
-Patch2:                %{name}-ia64.patch
-Patch3:                %{name}-unicode.patch
-Patch4:                %{name}-dicom.patch
-Patch5:                %{name}-lmagic.patch
-Patch6:                %{name}-python2.4.patch
-Patch7:                %{name}-greedy-dump.patch
-Patch8:                ftp://ftp.astron.com/pub/file/%{name}-4.14.patch1
+Patch2:                %{name}-unicode.patch
+Patch3:                %{name}-dicom.patch
+Patch4:                %{name}-lmagic.patch
+Patch5:                %{name}-python2.4.patch
+Patch6:                %{name}-greedy-dump.patch
+Patch7:                %{name}-stdin-noclose.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -54,6 +53,7 @@ BuildRequires:        python-devel
 BuildRequires: python-modules
 %endif
 Requires:      libmagic = %{version}-%{release}
+Conflicts:     rpm-build < 4.4.1-9
 Conflicts:     xdelta < 1.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -252,10 +252,6 @@ Wi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p0
-
-# temporary workaround
-touch magic/Magdir/mup
 
 %build
 %{__libtoolize}
@@ -277,10 +273,15 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT%{_libdir}/libmagic.so.*.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libmagic.so.*.*) \
+        $RPM_BUILD_ROOT%{_libdir}/libmagic.so
+
 %if %{with python}
 cd python
 python setup.py install \
@@ -328,7 +329,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libmagic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) /%{_lib}/lib*.so.*.*
 
 %files -n libmagic-devel
 %defattr(644,root,root,755)