SPECS: texlive.spec - various fixes

uzsolt uzsolt at pld-linux.org
Thu Dec 25 17:21:53 CET 2008


Author: uzsolt                       Date: Thu Dec 25 16:21:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- various fixes

---- Files affected:
SPECS:
   texlive.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.55 SPECS/texlive.spec:1.56
--- SPECS/texlive.spec:1.55	Thu Dec 25 12:41:32 2008
+++ SPECS/texlive.spec	Thu Dec 25 17:21:48 2008
@@ -134,8 +134,8 @@
 Obsoletes:	tetex-tex-vietnam
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		texmf	%{_datadir}/texmf
-%define		texmfdist %{texmf}/dist
+%define		texmf	%{_datadir}/texlive-texmf
+%define		texmfdist %{texmf}-dist
 %define		fmtdir	/var/lib/texmf/web2c
 %define		texhash	[ ! -x %{_bindir}/texhash ] || %{_bindir}/texhash 1>&2;
 %define		_localstatedir	/var/lib/texmf
@@ -3245,7 +3245,14 @@
 
 %build
 find . -name "config.sub" -exec cp /usr/share/automake/config.sub '{}' ';'
+pushd texk/kpathsea
 %{__sed} -i 's@"extend/\(.*\)"@<\1>@' texk/ttf2pk/*.c
+%{__sed} -i 's/^TEXMFMAIN =.*/TEXMFMAIN = %{texmf}/' texmf.cnf
+%{__sed} -i 's/^TEXMFDIST =.*/TEXMFDIST = %{texmfdist}/' texmf.cnf
+%{__sed} -i 's/^TEXMFLOCAL =.*/TEXMFLOCAL = %{texmf}/' texmf.cnf
+%{__sed} -i 's/^TEXMFSYSVAR =.*/TEXMFSYSVAR = %{_localstatedir}/' texmf.cnf
+%{__sed} -i 's/^TEXMFSYSCONFIG =.*/TEXMFSYSCONFIG = %{_sysconfdir}/%{name}' texmf.cnf
+popd
 
 %configure \
 %if %{with bootstrap}
@@ -3270,7 +3277,7 @@
 	--with-system-pnglib \
 	--with-system-t1lib \
 	--with-system-zlib \
-	--with-texmf-dir=texlive-20080822-texmf \
+	--with-texmf-dir=../../texmf \
 	--with-xdvi-x-toolkit=xaw \
 	--without-dialog \
 	--without-t1utils \
@@ -3297,7 +3304,7 @@
 #	-e "s|/var/cache/fonts|$RPM_BUILD_ROOT/var/cache/fonts|g;" \
 #	texmf/web2c/texmf.cnf
 
-install -d $RPM_BUILD_ROOT%{texmf}/{dist,doc}
+install -d $RPM_BUILD_ROOT%{texmf}/doc $RPM_BUILD_ROOT%{texmfdist}
 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}
@@ -4947,6 +4954,10 @@
 
 %dir %{texmf}/dvipdfm
 %{texmf}/dvipdfm/config
+%dir %{texmfdist}/fonts/map/dvips/cmex
+%dir %{texmf}/doc/dvipdfm
+%dir %{texmf}/doc/dvips
+
 
 %files dvilj
 %defattr(644,root,root,755)
@@ -6631,6 +6642,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2008/12/25 16:21:48  uzsolt
+- various fixes
+
 Revision 1.55  2008/12/25 11:41:32  uzsolt
 - %dir fixes
 
================================================================

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



More information about the pld-cvs-commit mailing list