Update to TeX Live 2014
- fix dependencies
This commit is contained in:
parent
aba32e1776
commit
f144dd9cb3
210
texlive.spec
210
texlive.spec
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
%global source_date 20140525_r34255
|
||||
%global tl_version 2014
|
||||
%global tl_rel 0.1
|
||||
%global tl_rel 1
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
@ -23,7 +23,7 @@
|
||||
Name: texlive
|
||||
Version: %{tl_version}
|
||||
Release: %{tl_release}
|
||||
Epoch: 3
|
||||
Epoch: 4
|
||||
Summary: TeX formatting system
|
||||
Group: Applications/Publishing
|
||||
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
|
||||
|
||||
%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
|
||||
- update to TeX Live 2014 release candidate
|
||||
- conflict with ht package (#959696)
|
||||
|
4
tl2rpm.c
4
tl2rpm.c
@ -1459,7 +1459,6 @@ void solve(char *name) {
|
||||
if ( !strcmp(name, "tex4ht") ) {
|
||||
fprintf(fpack, "Provides: tetex-tex4ht = %%{tl_version}\n");
|
||||
fprintf(fpack, "Obsoletes: tetex-tex4ht < %%{tl_version}\n");
|
||||
fprintf(fpack, "Conflicts: ht\n");
|
||||
}
|
||||
if ( !strcmp(name, "latex") ) {
|
||||
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]));
|
||||
if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n");
|
||||
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") ) {
|
||||
fprintf(fpack, "Requires: teckit\n");
|
||||
fprintf(fpack, "Provides: xdvipdfmx = %%{version}-%%{release}\n");
|
||||
@ -2164,6 +2162,8 @@ void solve(char *name) {
|
||||
fprintf(fpack, "Release: %%{tl_release}\n");
|
||||
if ( noarch ) {
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user