Attachment 161973 Details for Bug 242416 – mainly correct kpathsea paths and allow for build without texlive-texmf

[patch] mainly correct kpathsea paths and allow for build without texlive-texmf

texlive.spec-0.10.diff (text/plain), 6.41 KB, created by Patrice Dumas on 2007-08-21 14:07:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-08-21 14:07:50 UTC

Size: 6.41 KB

patch

obsolete

>--- texlive.spec-0.10	2007-08-21 15:51:25.000000000 +0200
>+++ texlive.spec	2007-08-21 15:53:38.000000000 +0200
>@@ -45,12 +45,15 @@
> ######
> 
> # and sane defaults to build against can be inserted via sed
>-Patch0: texlive-2007-varconfig.patch  
>+#Patch0: texlive-2007-varconfig.patch  
> Patch5: texlive-2007-browser.patch
> Patch6: texlive-2007-tkdep.patch
> Patch8: texlive-2007-xprint.patch
> Patch9: texlive-teckit.patch
> 
>+Patch21: texlive-more_paths.patch
>+Patch22: texlive-fedora_paths.patch
>+
> ######
> # TeX patches
> ######
>@@ -88,7 +91,7 @@
> Patch114:       texlive-dvips_fontbug_fix_upstream.patch
> Patch115:       texlive-maketexmf.patch
> Patch117:       texlive-fmtutil_keep_failedlog.patch
>-Patch118:       texlive-builtin-searchpath-fix.patch
>+#Patch118:       texlive-builtin-searchpath-fix.patch
> Patch119:       texlive-checklib_fixes.patch
> Patch120:       texlive-dvipdfm_timezone.patch
> Patch123:       texlive-fix_makempx_installation.patch
>@@ -119,7 +122,7 @@
> BuildRequires:	libSM-devel libICE-devel Xaw3d-devel
> # for non-modular xorg - use xorg-devel instead of above
> BuildRequires:	teckit-devel
>-BuildRequires:	texlive-texmf = %{version}
>+#BuildRequires:	texlive-texmf = %{version}
> Requires:	xdg-utils htmlview
> Requires:	texlive-texmf = %{version}
> Requires:	texlive-fonts = %{version}-%{release}
>@@ -152,7 +155,7 @@
> Group: Applications/Publishing
> Obsoletes: tetex-afm <= 3.0
> Provides:  tetex-afm = 3.1
>-BuildRequires: texlive-texmf-afm = %{version}
>+#BuildRequires: texlive-texmf-afm = %{version}
> Requires: texlive-texmf-afm = %{version}
> Requires: texlive-texmf-errata = %{version}
> 
>@@ -181,7 +184,7 @@
> Requires: psutils
> Obsoletes: tetex-dvips <= 3.0
> Provides:  tetex-dvips = 3.1
>-BuildRequires: texlive-texmf-dvips = %{version}
>+#BuildRequires: texlive-texmf-dvips = %{version}
> Requires: texlive-texmf-dvips = %{version}
> Requires: texlive-texmf-errata = %{version}
> 
>@@ -217,7 +220,7 @@
> Group: Applications/Publishing
> Obsoletes: tetex-fonts <= 3.0
> Provides:  tetex-fonts = 3.1
>-BuildRequires: texlive-texmf-fonts = %{version}
>+#BuildRequires: texlive-texmf-fonts = %{version}
> Requires: texlive-texmf-fonts >= %{version}
> Requires: texlive-texmf-errata = %{version}
> 
>@@ -242,7 +245,7 @@
> BuildRequires: ghostscript netpbm-progs
> Obsoletes: tetex-latex <= 3.0
> Provides:  tetex-latex = 3.1
>-BuildRequires: texlive-texmf-latex = %{version}
>+#BuildRequires: texlive-texmf-latex = %{version}
> Requires: texlive-texmf-latex = %{version}
> Requires: texlive-texmf-errata = %{version}
> 
>@@ -323,12 +326,13 @@
> ######
> # Red Hat-specific TeX configuration patches
> ######
>-%patch0 -p1 -b .varconfig
>+#%patch0 -p1 -b .varconfig
> # Use htmlview first
> %patch5 -p1 -b .browser
> %patch6 -p1 -b .tkdep
> %patch8 -p1 -b .xprint
> %patch9 -p1 -b .teckit
>+%patch22 -p1 -b .fedora_paths
> 
> ######
> # TeX patches
>@@ -348,6 +352,7 @@
> %patch19 -p0 -b .kpse-extensions
> # texdoc searches $TEXMF/doc -- should use $TEXMFDOCS (#232769)
> #%patch20 -p1 -b .texdoc
>+%patch21 -p1 -b .more_paths
> 
> # fix non utf man pages
> %patch41 -p1 -b .notutf8
>@@ -369,7 +374,7 @@
> %patch114 -p3
> %patch115 -p3
> %patch117 -p3
>-%patch118 -p3
>+#%patch118 -p3
> %patch119 -p3
> %patch120 -p3
> %patch123 -p3
>@@ -386,14 +391,14 @@
> %patch306 -p0
> 
> 
>-pushd texk/kpathsea
>-%{__sed} -i 's?^TEXMF =.*?TEXMF = {\$TEXMFCONFIG,\$TEXMFVAR,\$TEXMFHOME,\$TEXMFSYSCONFIG,\!\!\$TEXMFSYSVAR,\!\!\$TEXMFLOCAL,\!\!\$TEXMFMAIN,\!\!\$TEXMFDIST}?' texmf.in
>-%{__sed} -i 's?^TEXMFMAIN =.*?TEXMFMAIN = %{_texmf_main}?' texmf.in
>-%{__sed} -i 's?^TEXMFDIST =.*?TEXMFDIST = %{_texmf_main}?' texmf.in
>-%{__sed} -i 's?^TEXMFLOCAL =.*?TEXMFLOCAL = /usr/local/texmf?' texmf.in
>-%{__sed} -i 's?^TEXMFSYSVAR =.*?TEXMFSYSVAR = %{_texmf_var}?' texmf.in
>-%{__sed} -i 's?^TEXMFSYSCONFIG =.*?TEXMFSYSCONFIG = %{_texmf_conf}?' texmf.in
>-popd
>+#pushd texk/kpathsea
>+#%{__sed} -i 's?^TEXMF =.*?TEXMF = {\$TEXMFCONFIG,\$TEXMFVAR,\$TEXMFHOME,\$TEXMFSYSCONFIG,\!\!\$TEXMFSYSVAR,\!\!\$TEXMFLOCAL,\!\!\$TEXMFMAIN,\!\!\$TEXMFDIST}?' texmf.in
>+#%{__sed} -i 's?^TEXMFMAIN =.*?TEXMFMAIN = %{_texmf_main}?' texmf.in
>+#%{__sed} -i 's?^TEXMFDIST =.*?TEXMFDIST = %{_texmf_main}?' texmf.in
>+#%{__sed} -i 's?^TEXMFLOCAL =.*?TEXMFLOCAL = /usr/local/texmf?' texmf.in
>+#%{__sed} -i 's?^TEXMFSYSVAR =.*?TEXMFSYSVAR = %{_texmf_var}?' texmf.in
>+#%{__sed} -i 's?^TEXMFSYSCONFIG =.*?TEXMFSYSCONFIG = %{_texmf_conf}?' texmf.in
>+#popd
> 
> %if %{disable_lcdf_typetools}
> pushd utils
>@@ -432,6 +437,7 @@
>         --without-texlive \
>         --without-t1utils \
>         --without-psutils \
>+        --without-ps2eps \
> 	--without-pdfopen \
> 	--without-ttf2pk \
>         --disable-multiplatform \
>@@ -463,7 +469,7 @@
> mkdir -p %{buildroot}%{_texmf_var}
> mkdir -p %{buildroot}%{_texmf_conf}
> 
>-#export LD_LIBRARY_PATH=`pwd`/texk/kpathsea/.libs
>+export LD_LIBRARY_PATH=`pwd`/texk/kpathsea/.libs
> 
> %makeinstall \
>         texmf=%{buildroot}%{_texmf_main} \
>@@ -501,21 +507,25 @@
> ### not in octave-forge, nuking anyway
> rm -f %{buildroot}%{_bindir}/pdfmex
> rm -f %{buildroot}%{_bindir}/utf8mex
>-# ps2eps
>-rm -f %{buildroot}%{_bindir}/ps2eps
>-rm -f %{buildroot}%{_bindir}/bbox
>-rm -f %{buildroot}%{_mandir}/man1/ps2eps.1*
>-rm -f %{buildroot}%{_mandir}/man1/bbox.1*
> 
> # install cron file
> install -D -m755 %{SOURCE10} %{buildroot}%{_sysconfdir}/cron.daily/texlive.cron
> 
> # these are owned by texmf-fonts package
>-rm -f %{buildroot}%{_texmf_main}/ls-R
>-rm -f %{buildroot}%{_texmf_var}/ls-R
>-rm -f %{buildroot}%{_texmf_conf}/ls-R
>-rm -f %{buildroot}%{_texmf_main}/web2c/texmf.cnf
>-rm -f %{buildroot}%{_texmf_main}/web2c/fmtutil.cnf
>+rm %{buildroot}%{_texmf_main}/ls-R
>+#rm %{buildroot}%{_texmf_var}/ls-R
>+#rm %{buildroot}%{_texmf_conf}/ls-R
>+rm %{buildroot}%{_texmf_main}/web2c/fmtutil.cnf
>+
>+# this file is different from the one in texmf-fonts, since it is 
>+# the one from kpathsea which isn't specific of texlive. It is only 
>+# used during build and to set the kpathsea default paths, however.
>+# Kept as documentation together with paths.h since they describe
>+# what the kpathsea default paths are
>+rm -rf __fedora_kpathsea
>+mkdir -p __fedora_kpathsea/kpathsea_defaults
>+mv %{buildroot}%{_texmf_main}/web2c/texmf.cnf __fedora_kpathsea/kpathsea_defaults/texmf-kpathsea-defaults.cnf
>+cp texk/kpathsea/paths.h __fedora_kpathsea/kpathsea_defaults
> 
> # these are owned by texmf-doc package
> rm -rf %{buildroot}%{_texmf_main}/doc/tetex
>@@ -1004,6 +1014,7 @@
> %defattr(-,root,root,-)
> %{_libdir}/libkpathsea.so.*
> %{_infodir}/kpathsea.info.*
>+%doc __fedora_kpathsea/kpathsea_defaults/
> 
> %files -n kpathsea-devel
> %defattr(-,root,root,-)

Actions: View | Diff

Attachments on bug 242416: 158208 | 161796 | 161797 | 161799 | 161800 | 161801 | 161802 | 161803 | 161973 | 161974 | 161975 | 195671 | 195691