X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file.spec;h=63bc2290618f858ed4888de2d3b9506fc0f35e40;hb=d27b7da19ae6da9cd181ead65f0078c59656a249;hp=73d3b6f21b47e643494d505eb0a54013ced7c613;hpb=b8d7bc030d08fc3bf99cde9e994633f6cbf141bd;p=packages%2Ffile.git

diff --git a/file.spec b/file.spec
index 73d3b6f..63bc229 100644
--- a/file.spec
+++ b/file.spec
@@ -27,16 +27,16 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	4.20
+Version:	4.23
 Release:	2
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	402bdb26356791bd5d277099adacc006
-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
+# Source0-md5:	014a69979a8d5225a6ca2bcc4d7e967e
+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
+Source3:	%{name}-mscompress.magic
 Patch0:		%{name}-debian.patch
 Patch1:		%{name}-sparc.patch
 Patch2:		%{name}-lmagic.patch
@@ -44,7 +44,6 @@ Patch3:		%{name}-greedy-dump.patch
 Patch4:		%{name}-magic.patch
 Patch5:		%{name}-selinux.patch
 Patch6:		%{name}-msdos.patch
-Patch7:		%{name}-DoS.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -251,7 +250,6 @@ Wiązania Pythona dla libmagic.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -278,8 +276,8 @@ 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.*.*) \
+mv $RPM_BUILD_ROOT%{_libdir}/libmagic.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libdir}/libmagic.so
 
 %if %{with python}
@@ -292,9 +290,9 @@ cd ..
 
 install -D magic/magic.local $RPM_BUILD_ROOT%{_sysconfdir}/magic
 
-cat %{SOURCE1} %{SOURCE3} >>$RPM_BUILD_ROOT%{_datadir}/file/magic
+cat %{SOURCE2} %{SOURCE3} >>$RPM_BUILD_ROOT%{_datadir}/file/magic
 
-bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 # somebody forgot about patching in tarball
 mv -f $RPM_BUILD_ROOT%{_mandir}/pt_BR/man{4,5}
@@ -333,13 +331,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libmagic
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libmagic.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libmagic.so.1
 
 %files -n libmagic-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmagic.so
 %{_libdir}/libmagic.la
 %{_includedir}/magic.h
-%{_mandir}/man3/*
+%{_mandir}/man3/libmagic.3*
 
 %if %{with static_libs}
 %files -n libmagic-static
@@ -350,6 +349,6 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python}
 %files -n python-magic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/magic.so
 %{py_sitedir}/Magic_file_extensions-*.egg-info
 %endif