SPECS: texlive.spec - unpack of texlive-texmf moved to %install

[uzsolt]

Author: uzsolt                       Date: Thu Dec 25 23:02:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unpack of texlive-texmf moved to %install

---- Files affected:
SPECS:
   texlive.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.64 SPECS/texlive.spec:1.65
--- SPECS/texlive.spec:1.64	Thu Dec 25 22:31:27 2008
+++ SPECS/texlive.spec	Fri Dec 26 00:02:45 2008
@@ -138,7 +138,7 @@
 Obsoletes:	tetex-tex-vietnam
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		texmf	%{_datadir}/texlive-texmf
+%define		texmf	%{_datadir}/texmf
 %define		texmfdist %{texmf}-dist
 %define		texmfdoc %{texmf}-doc
 %define		fmtdir	/var/lib/texmf/web2c
@@ -3304,7 +3304,6 @@
 %prep
 %setup -q -c -T -n %{name}-%{version}-source
 lzma -dc %{SOURCE0} | tar xf - -C ..
-lzma -dc %{SOURCE1} | tar xf - -C .
 %patch0 -p1
 %patch1 -p1
 
@@ -3349,7 +3348,6 @@
 	--with-system-pnglib \
 	--with-system-t1lib \
 	--with-system-zlib \
-	--with-texmf-dir=../../texmf \
 	--with-xdvi-x-toolkit=xaw \
 	--without-dialog \
 	--without-t1utils \
@@ -3369,6 +3367,15 @@
 	$RPM_BUILD_ROOT%{_localstatedir}/fonts/map\
 	$RPM_BUILD_ROOT%{fmtdir}
 
+lzma -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_datadir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf $RPM_BUILD_ROOT%{texmf}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-dist $RPM_BUILD_ROOT%{texmfdist}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-doc $RPM_BUILD_ROOT%{texmfdoc}
+%{__mv} $RPM_BUILD_ROOT%{texmfdist}/dvips/* $RPM_BUILD_ROOT%{texmf}
+%{__mv} $RPM_BUILD_ROOT%{texmfdist}/tex/* $RPM_BUILD_ROOT%{texmf}
+# This is an empty directory
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf
+
 # commented out because of following (non-fatal) error:
 # Can't open texmf/web2c/texmf.cnf: No such file or directory.
 #perl -pi \
@@ -3376,11 +3383,9 @@
 #	-e "s|/var/cache/fonts|$RPM_BUILD_ROOT/var/cache/fonts|g;" \
 #	texmf/web2c/texmf.cnf
 
-install -d $RPM_BUILD_ROOT%{texmf} $RPM_BUILD_ROOT%{texmfdist} $RPM_BUILD_ROOT%{texmfdoc}
-%{__cp} -a texlive-20080822-texmf/texmf/* $RPM_BUILD_ROOT%{texmf}
-# cp -a texlive-20080822-texmf/texmf-dist/dvips $RPM_BUILD_ROOT%{texmf}
-# cp -a texlive-20080822-texmf/texmf-dist/tex $RPM_BUILD_ROOT%{texmf}
-%{__cp} -a texlive-20080822-texmf/texmf-dist/* $RPM_BUILD_ROOT%{texmfdist}
+# install -d $RPM_BUILD_ROOT%{texmf} $RPM_BUILD_ROOT%{texmfdist} $RPM_BUILD_ROOT%{texmfdoc}
+# %{__cp} -a texlive-20080822-texmf/texmf/* $RPM_BUILD_ROOT%{texmf}
+# %{__cp} -a texlive-20080822-texmf/texmf-dist/* $RPM_BUILD_ROOT%{texmfdist}
 # %{__cp} -a texlive-20080822-texmf/texmf-doc/* $RPM_BUILD_ROOT%{texmfdoc}
 
 install -d $RPM_BUILD_ROOT%{texmf}/fonts/opentype/public
@@ -6480,8 +6485,8 @@
 %files fonts-px
 %defattr(644,root,root,755)
 %doc %{texmfdist}/doc/fonts/pxfonts
-%doc %{texmf}/doc/doc/english/free-math-font-survey/source/pxfonts.tex
-%doc %{texmf}/doc/doc/english/free-math-font-survey/images/pxfonts.png
+# %doc %{texmf}/doc/doc/english/free-math-font-survey/source/pxfonts.tex
+# %doc %{texmf}/doc/doc/english/free-math-font-survey/images/pxfonts.png
 %dir %{texmfdist}/fonts/map/dvips/pxfonts
 %dir %{texmfdist}/tex/latex/pxfonts
 %{texmfdist}/fonts/map/dvips/pxfonts/pxfonts.map
@@ -6756,6 +6761,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2008/12/25 23:02:45  uzsolt
+- unpack of texlive-texmf moved to %install
+
 Revision 1.64  2008/12/25 21:31:27  uzsolt
 - R(post,postun) and %post, %postun of SIunits, exam, abstract, lastpage, ntheorem
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.64&r2=1.65&f=u