Update to TeX Live 2014

- fix dependencies
This commit is contained in:
Jindrich Novy 2014-07-23 06:40:00 +01:00
parent aba32e1776
commit f144dd9cb3
3 changed files with 67 additions and 155 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
%global source_date 20140525_r34255 %global source_date 20140525_r34255
%global tl_version 2014 %global tl_version 2014
%global tl_rel 0.1 %global tl_rel 1
%global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source %global source_name texlive-%{source_date}-source
@ -23,7 +23,7 @@
Name: texlive Name: texlive
Version: %{tl_version} Version: %{tl_version}
Release: %{tl_release} Release: %{tl_release}
Epoch: 3 Epoch: 4
Summary: TeX formatting system Summary: TeX formatting system
Group: Applications/Publishing Group: Applications/Publishing
License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia
@ -386,6 +386,10 @@ fi
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Tue Jul 22 2014 Jindrich Novy <novyjindrich@gmail.com> - 2014-1-20140525
- Tex Live 2014 is out
- fix package dependencies to make update path smoother
* Sun Jun 8 2014 Jindrich Novy <novyjindrich@gmail.com> - 2014-0.1-20140525 * Sun Jun 8 2014 Jindrich Novy <novyjindrich@gmail.com> - 2014-0.1-20140525
- update to TeX Live 2014 release candidate - update to TeX Live 2014 release candidate
- conflict with ht package (#959696) - conflict with ht package (#959696)

View File

@ -1459,7 +1459,6 @@ void solve(char *name) {
if ( !strcmp(name, "tex4ht") ) { if ( !strcmp(name, "tex4ht") ) {
fprintf(fpack, "Provides: tetex-tex4ht = %%{tl_version}\n"); fprintf(fpack, "Provides: tetex-tex4ht = %%{tl_version}\n");
fprintf(fpack, "Obsoletes: tetex-tex4ht < %%{tl_version}\n"); fprintf(fpack, "Obsoletes: tetex-tex4ht < %%{tl_version}\n");
fprintf(fpack, "Conflicts: ht\n");
} }
if ( !strcmp(name, "latex") ) { if ( !strcmp(name, "latex") ) {
fprintf(fpack, "Provides: tetex-latex = 3.1-99, texlive-texmf-latex = %%{tl_version}\n"); fprintf(fpack, "Provides: tetex-latex = 3.1-99, texlive-texmf-latex = %%{tl_version}\n");
@ -2092,7 +2091,6 @@ void solve(char *name) {
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i])); fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n");
if ( has_noarch_pkg ) fprintf(fpack, "Requires: texlive-%s\n", name); if ( has_noarch_pkg ) fprintf(fpack, "Requires: texlive-%s\n", name);
fprintf(fpack, "Requires: texlive-kpathsea-lib = %%{epoch}:%%{tl_version}-%%{tl_release}\n");
if ( !strcmp(name, "xetex") ) { if ( !strcmp(name, "xetex") ) {
fprintf(fpack, "Requires: teckit\n"); fprintf(fpack, "Requires: teckit\n");
fprintf(fpack, "Provides: xdvipdfmx = %%{version}-%%{release}\n"); fprintf(fpack, "Provides: xdvipdfmx = %%{version}-%%{release}\n");
@ -2164,6 +2162,8 @@ void solve(char *name) {
fprintf(fpack, "Release: %%{tl_release}\n"); fprintf(fpack, "Release: %%{tl_release}\n");
if ( noarch ) { if ( noarch ) {
fprintf(fpack, "BuildArch: noarch\n"); fprintf(fpack, "BuildArch: noarch\n");
} else {
fprintf(fpack, "Requires: texlive-kpathsea-lib%{?_isa} = %%{epoch}:%%{tl_version}\n");
} }
} }
fprintf(fpack, "\n%%description %s-bin\n", name); fprintf(fpack, "\n%%description %s-bin\n", name);