SPECS: file.spec - unified .magic file naming

[qboosh]

Author: qboosh                       Date: Sat May 26 17:14:46 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified .magic file naming

---- Files affected:
SPECS:
   file.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SPECS/file.spec
diff -u SPECS/file.spec:1.131 SPECS/file.spec:1.132
--- SPECS/file.spec:1.131	Mon Apr 30 21:27:51 2007
+++ SPECS/file.spec	Sat May 26 19:14:41 2007
@@ -34,10 +34,10 @@
 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
+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
@@ -296,9 +296,9 @@
 
 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}
@@ -364,6 +364,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2007/05/26 17:14:41  qboosh
+- unified .magic file naming
+
 Revision 1.131  2007/04/30 19:27:51  arekm
 - rel 3; one patch from upstream + disable problematic regexps instead of working around them
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/file.spec?r1=1.131&r2=1.132&f=u