[texlive/f18] Make non-texlive packages visible to kpathsea and fix versioning
Jindrich Novy
jnovy at fedoraproject.org
Fri Oct 19 12:31:50 UTC 2012
commit d0d12ae528b1b3cf03eb0f28658810f9a2ff673a
Author: Jindrich Novy <jnovy at redhat.com>
Date: Fri Oct 19 14:34:59 2012 +0200
Make non-texlive packages visible to kpathsea and fix versioning
.gitignore | 2 +-
sources | 2 +-
texlive.spec | 20 +++++++++++++++-----
texlive.spec.template | 20 +++++++++++++++-----
4 files changed, 32 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 441deef..d356c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4825,7 +4825,6 @@
/texlive-scripts.tar.xz
/texlive-sr.doc.tar.xz
/texlive-zh-cn.doc.tar.xz
-/texlive-20120926_r27815-source.tar.xz
/texloganalyser.doc.tar.xz
/texloganalyser.i386-linux.tar.xz
/texloganalyser.tar.xz
@@ -5504,3 +5503,4 @@
/12many.tar.xz
/2up.doc.tar.xz
/2up.tar.xz
+/texlive-20121019_r28030-source.tar.xz
diff --git a/sources b/sources
index 89be4f9..caf04ba 100644
--- a/sources
+++ b/sources
@@ -4825,7 +4825,6 @@ b64fe91d55d76f2fc4c85c1f11eb2c67 texlive-scripts.doc.tar.xz
61a038eb43dbb0cbbc068114e80b06f1 texlive-scripts.tar.xz
3065bdeeddd6f40e3eb0f642f9a60a2d texlive-sr.doc.tar.xz
97b2789c4d61ae06a032869209990213 texlive-zh-cn.doc.tar.xz
-43bf5f9594972f9b1df0933740c1b37e texlive-20120926_r27815-source.tar.xz
dd61bb4c5e070a47a96149d9e2e21445 texloganalyser.doc.tar.xz
b9a82dd58b5f132bae570c57a11db4aa texloganalyser.i386-linux.tar.xz
9c5b6a7021b601df4285d02bba729d0d texloganalyser.tar.xz
@@ -5504,3 +5503,4 @@ d9b1e9be31680dc5cc834046e294b2fa zwpagelayout.tar.xz
69ec0bac5187782998de2fcf864869ef 12many.tar.xz
847ee7231fe605d1f1283f40c2782709 2up.doc.tar.xz
eadb8e1d91dfb3fdd2d50539a792123a 2up.tar.xz
+022c4016b8dcd90eaa67b0ad68f024ad texlive-20121019_r28030-source.tar.xz
diff --git a/texlive.spec b/texlive.spec
index 144c21e..60f2382 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,12 +1,11 @@
-%global source_date 20120926_r27815
+%global source_date 20121019_r28030
%global tl_version 2012
%global tl_release 3.%{source_date}%{?dist}
-%global tl_noarch_release %{tl_release}
+%global tl_noarch_release 1%{?dist}
%global source_name texlive-%{source_date}-source
%{!?_texdir: %global _texdir %{_datadir}/%{name}}
%{!?_texmf_var: %global _texmf_var %{_var}/lib/texmf}
-%{!?_texmf_local: %global _texmf_local %{_texdir}/texmf-local}
# don't figure any perl requires
%global __perl_requires %{nil}
@@ -173148,8 +173147,10 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_texdir}/../texmf
mkdir -p %{buildroot}%{_texdir}/texmf-config/web2c
mkdir -p %{buildroot}%{_texmf_var}
-mkdir -p %{buildroot}%{_texmf_local}
mkdir -p %{buildroot}%{_texdir}/texmf-dist
+pushd %{buildroot}%{_texdir}
+ln -s ../texmf texmf-local
+popd
xz -dc %{SOURCE100} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE101} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE103} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -177916,6 +177917,9 @@ for i in ctxtools luatools texexec texmfstart; do
sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
done
+# configure texmf-local - make it visible to kpathsea
+sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' %{buildroot}/%{_texdir}/texmf/web2c/texmf.cnf
+
%clean
rm -rf %{buildroot}
@@ -177943,7 +177947,7 @@ fi
%dir %{_texdir}/texmf-var
%dir %{_texdir}/../texmf
%dir %{_texdir}/licenses
-%dir %{_texmf_local}
+%dir %{_texdir}/texmf-local
%dir %{_texdir}/
%dir %{_texdir}/readme-html.dir
%dir %{_texdir}/readme-txt.dir
@@ -297857,6 +297861,12 @@ fi
%{_libdir}/*.so
%changelog
+* Fri Oct 19 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121019
+- sync with upstream sources
+- make /usr/share/texmf visible to kpathsea, make texmf-local
+pointing to it (#867656, #864875)
+- fix versioning of binaty packages
+
* Tue Oct 9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
- obsolete chktex (#864211)
- make config.ps a config file (#441171)
diff --git a/texlive.spec.template b/texlive.spec.template
index 1e4641a..0196e9c 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,12 +1,11 @@
-%global source_date 20120926_r27815
+%global source_date 20121019_r28030
%global tl_version 2012
%global tl_release 3.%{source_date}%{?dist}
-%global tl_noarch_release %{tl_release}
+%global tl_noarch_release 1%{?dist}
%global source_name texlive-%{source_date}-source
%{!?_texdir: %global _texdir %{_datadir}/%{name}}
%{!?_texmf_var: %global _texmf_var %{_var}/lib/texmf}
-%{!?_texmf_local: %global _texmf_local %{_texdir}/texmf-local}
# don't figure any perl requires
%global __perl_requires %{nil}
@@ -150,8 +149,10 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_texdir}/../texmf
mkdir -p %{buildroot}%{_texdir}/texmf-config/web2c
mkdir -p %{buildroot}%{_texmf_var}
-mkdir -p %{buildroot}%{_texmf_local}
mkdir -p %{buildroot}%{_texdir}/texmf-dist
+pushd %{buildroot}%{_texdir}
+ln -s ../texmf texmf-local
+popd
%include _mkdirs.spec
%include _unpack.spec
# nuke useless tlmgr packaging stuff and doc droppings
@@ -249,6 +250,9 @@ for i in ctxtools luatools texexec texmfstart; do
sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
done
+# configure texmf-local - make it visible to kpathsea
+sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local|' %{buildroot}/%{_texdir}/texmf/web2c/texmf.cnf
+
%clean
rm -rf %{buildroot}
@@ -276,7 +280,7 @@ fi
%dir %{_texdir}/texmf-var
%dir %{_texdir}/../texmf
%dir %{_texdir}/licenses
-%dir %{_texmf_local}
+%dir %{_texdir}/texmf-local
%include _dirs.spec
%{_texdir}/licenses/*
%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf/ls-R
@@ -300,6 +304,12 @@ fi
%{_libdir}/*.so
%changelog
+* Fri Oct 19 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121019
+- sync with upstream sources
+- make /usr/share/texmf visible to kpathsea, make texmf-local
+ pointing to it (#867656, #864875)
+- fix versioning of binaty packages
+
* Tue Oct 9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
- obsolete chktex (#864211)
- make config.ps a config file (#441171)
More information about the scm-commits
mailing list