SPECS: file.spec - avoid processing *.orig patching leftovers into magic.mg...
qboosh
qboosh at pld-linux.org
Sat May 31 01:23:45 CEST 2008
Author: qboosh Date: Fri May 30 23:23:45 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- avoid processing *.orig patching leftovers into magic.mgc
- provide full magic file instead of just additions
---- Files affected:
SPECS:
file.spec (1.142 -> 1.143)
---- Diffs:
================================================================
Index: SPECS/file.spec
diff -u SPECS/file.spec:1.142 SPECS/file.spec:1.143
--- SPECS/file.spec:1.142 Wed Apr 23 23:01:55 2008
+++ SPECS/file.spec Sat May 31 01:23:40 2008
@@ -252,6 +252,8 @@
%patch5 -p1
%patch6 -p1
+rm -f magic/Magdir/*.orig
+
%build
%{__libtoolize}
%{__aclocal}
@@ -291,7 +293,7 @@
install -D magic/magic.local $RPM_BUILD_ROOT%{_sysconfdir}/magic
-cat %{SOURCE2} %{SOURCE3} >>$RPM_BUILD_ROOT%{_datadir}/file/magic
+cat magic/Magdir/* %{SOURCE2} %{SOURCE3} >$RPM_BUILD_ROOT%{_datadir}/file/magic
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -301,7 +303,7 @@
> $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}/file/magic -c -C
rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
@@ -318,7 +320,8 @@
%attr(755,root,root) %{_bindir}/file
%{_datadir}/file
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/magic
-%{_mandir}/man[15]/*
+%{_mandir}/man1/file.1*
+%{_mandir}/man5/magic.5*
%lang(de) %{_mandir}/de/man[15]/*
%lang(es) %{_mandir}/es/man[15]/*
%lang(fr) %{_mandir}/fr/man[15]/*
@@ -360,6 +363,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.143 2008-05-30 23:23:40 qboosh
+- avoid processing *.orig patching leftovers into magic.mgc
+- provide full magic file instead of just additions
+
Revision 1.142 2008-04-23 21:01:55 glen
- LEGAL.NOTICE was renamed to COPYING for more compliance with the GNU autoconf
standards.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/file.spec?r1=1.142&r2=1.143&f=u
More information about the pld-cvs-commit
mailing list