rpms
/
texlive
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dependencies and upgrade path (#892054, #891709)

This commit is contained in:
Jindrich Novy 2013-01-07 14:38:16 +01:00
parent de2487dfc2
commit 2addf265b3
5 changed files with 15253 additions and 10366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25520
texlive.spec
View File

File diff suppressed because it is too large Load Diff

9
texlive.spec.template
View File

@ -1,6 +1,6 @@
%global source_date 20130102_r28692
%global tl_version 2012
%global tl_rel 11
%global tl_rel 12
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -17,7 +17,7 @@
Name: texlive
Version: %{tl_version}
Release: %{tl_release}
Epoch: 1
Epoch: 2
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
@ -102,7 +102,6 @@ xz -dc %{SOURCE0} | tar x
for l in `unxz -c %{SOURCE3} | tar t`; do
ln -s %{_texdir}/licenses/$l $l
done
#tar vfxz %{SOURCE7}
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@ -303,6 +302,10 @@ fi
%{_libdir}/*.so
%changelog
* Mon Jan 7 2013 Jindrich Novy <jnovy@redhat.com> 2012-11-20130102
- fix dependencies and upgrade path (#892054, #891709)
- do not ship windows and other unneeded files
* Wed Jan 2 2013 Jindrich Novy <jnovy@redhat.com> 2012-11-20130102
- sync with CTAN
- added new buildrequires

8
texlive.tlpdb
View File

@ -36155,7 +36155,7 @@ srcfiles size=20
texmf-dist/source/support/dosepsbin/install-sh
catalogue-ctan /support/dosepsbin
catalogue-date 2012-03-22 21:51:23 +0100
catalogue-license artistic
catalogue-license gpl
catalogue-version 1.2
name dosepsbin.i386-linux
@ -85091,7 +85091,7 @@ srcfiles size=21
texmf-dist/source/generic/mkjobtexmf/install-sh
catalogue-ctan /support/mkjobtexmf
catalogue-date 2011-11-16 11:07:17 +0100
catalogue-license artistic
catalogue-license gpl
catalogue-version 0.8
name mkjobtexmf.i386-linux
@ -120390,7 +120390,7 @@ docfiles size=6
texmf/doc/man/man1/texdiff.man1.pdf
catalogue-ctan /support/texdiff
catalogue-date 2009-11-10 00:58:07 +0100
catalogue-license artistic
catalogue-license gpl
catalogue-version 0.4
name texdiff.i386-linux
@ -120417,7 +120417,7 @@ docfiles size=4
texmf/doc/man/man1/texdirflatten.man1.pdf
catalogue-ctan /support/texdirflatten
catalogue-date 2012-01-12 19:29:56 +0100
catalogue-license artistic
catalogue-license gpl
catalogue-version 1.1
name texdirflatten.i386-linux

44
tl2rpm.c
View File

@ -225,7 +225,10 @@ char *pkg_blacklist[] = {
char *rem[] = { /* any file beginning with this will be removed */
// "texmf/scripts/tlgs/gswin32",
"texmf/doc/info/kpathsea.info",
"tlpkg/installer",
"texmf-dist/scripts/context/stubs/source",
"readme-txt.dir",
"tlpkg",
"install-tl",
NULL,
};
@ -687,7 +690,9 @@ void append_filelist( char *pkg, char *pkgsuf, int files, char **filelist, char
int i;
*end = saved;
if ( strstr(&filelist[n][bin_index], arch) ) continue; /* fool texlive.infra - don't install lzma/xz */
if (strstr(&filelist[n][bin_index], "win32") || strstr(&filelist[n][bin_index], "Win32") || strstr(&filelist[n][bin_index], "tlmgr") || !strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18)) {
if (strstr(&filelist[n][bin_index], "win32") || strstr(&filelist[n][bin_index], "mswin") ||
strstr(&filelist[n][bin_index], "Win32") || strstr(&filelist[n][bin_index], "tlmgr") ||
!strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18)) {
fprintf(fremove, "rm -f %%{buildroot}/%s/%s\n", bin?"%{_bindir}":"%{_texdir}", &filelist[n][bin_index]);
printf("*** %s\n", &filelist[n][bin_index]);
goto next;
@ -1054,6 +1059,18 @@ skip:
}
}
static char *print_noarch_version( package *p ) {
static char noarchver[0x100];
if ( p->catalogue_version ) {
snprintf(noarchver, sizeof(noarchver), "svn%s.%s\n", p->revision, p->catalogue_version );
} else {
snprintf(noarchver, sizeof(noarchver), "svn%s.0\n", p->revision);
}
return noarchver;
}
int level;
void solve(char *name) {
unsigned long h;
@ -1131,10 +1148,8 @@ void solve(char *name) {
} else {
fprintf(fpack, "Summary: %s package\n", name);
}
fprintf(fpack, "Version: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s\n", pkg[i].revision);
fprintf(fpack, "Release: ");
fprintf(fpack, "%%{tl_release}\n");
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
fprintf(fpack, "Release: %%{tl_release}\n");
fprintf(fpack, "BuildArch: noarch\n");
fprintf(fsrc, "Source%04d: "CTAN_URL"%s.tar."UNPACK"\n", mainsrcno++, name);
fprintf(fpack, "Requires: texlive-base\n");
@ -1276,8 +1291,7 @@ void solve(char *name) {
} else {
fprintf(fpack, "Summary: %s package\n", name);
}
fprintf(fpack, "Version: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s\n", pkg[i].revision);
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
fprintf(fpack, "Release: %%{tl_noarch_release}\n");
fprintf(fpack, "BuildArch: noarch\nAutoReqProv: No\n");
fprintf(fsrc, "Source%04d: "CTAN_URL"%s.tar."UNPACK"\n", srcno++, name);
@ -1825,8 +1839,7 @@ void solve(char *name) {
fprintf(fpack, "%%package %s-doc\n", name);
#endif
fprintf(fpack, "Summary: Documentation for %s\n", name);
fprintf(fpack, "Version: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s\n", pkg[i].revision);
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
fprintf(fpack, "Release: %%{tl_noarch_release}\n");
fprintf(fpack, "Provides: tex-%s-doc\n", name);
fprintf(fpack, "BuildArch: noarch\nAutoReqProv: No\n");
@ -1873,8 +1886,7 @@ void solve(char *name) {
fprintf(fpack, "%%package source\n");
#endif
fprintf(fpack, "Summary: Sources for %s\n", name);
fprintf(fpack, "Version: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s\n", pkg[i].revision);
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
fprintf(fpack, "Release: %%{tl_noarch_release}\n");
if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n");
fprintf(fpack, "BuildArch: noarch\nAutoReqProv: No\n");
@ -1928,8 +1940,7 @@ void solve(char *name) {
fprintf(fpack, "%%package %s-fedora-fonts\n", name);
#endif
fprintf(fpack, "Summary: Fonts for %s\n", name);
fprintf(fpack, "Version: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s\n", pkg[i].revision);
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
fprintf(fpack, "Release: %%{tl_noarch_release}\n");
fprintf(fpack, "Requires: fontpackages-filesystem\n");
fprintf(fpack, "BuildRequires: fontpackages-devel\n");
@ -2005,7 +2016,7 @@ void solve(char *name) {
*ar = '\0';
fprintf(fpack, "%%package %s-bin\n", name);
fprintf(fpack, "Summary: Binaries for %s\n", name);
fprintf(fpack, "Version: %%{tl_version}\n");
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); //else fprintf(fpack, "Provides: kpathsea = %%{tl_version}\nObsoletes: kpathsea < %%{tl_version}\n");
fprintf(fpack, "Requires: tex-%s\n", name);
if ( !strcmp(name, "xetex") ) {
@ -2078,8 +2089,7 @@ void solve(char *name) {
exit(1);
}
}
fprintf(fpack, "Release: ");
if ( pkg[i].catalogue_version ) fprintf(fpack, "%s.svn%s.%%{tl_release}\n", pkg[i].catalogue_version, pkg[i].revision ); else fprintf(fpack, "0.svn%s.%%{tl_release}\n", pkg[i].revision);
fprintf(fpack, "Release: %%{tl_release}\n");
if ( noarch ) {
fprintf(fpack, "BuildArch: noarch\n");
}

38
tlpdb.patch
View File

@ -1,5 +1,5 @@
--- texlive.tlpdb.orig 2013-01-02 08:21:41.455532160 +0100
+++ texlive.tlpdb 2013-01-02 08:21:41.527532203 +0100
+++ texlive.tlpdb 2013-01-05 08:00:56.258989841 +0100
@@ -76,7 +76,7 @@
catalogue-ctan /macros/latex/contrib/abc
catalogue-date 2008-03-08 20:47:21 +0100
@ -127,6 +127,15 @@
name collection-xetex
category Collection
revision 28124
@@ -36207,7 +36155,7 @@
texmf-dist/source/support/dosepsbin/install-sh
catalogue-ctan /support/dosepsbin
catalogue-date 2012-03-22 21:51:23 +0100
-catalogue-license artistic
+catalogue-license gpl
catalogue-version 1.2
name dosepsbin.i386-linux
@@ -49571,7 +49519,7 @@
catalogue-license lppl1.3
catalogue-version v2.2b
@ -246,6 +255,15 @@
name lshort-polish
category Package
@@ -85212,7 +85091,7 @@
texmf-dist/source/generic/mkjobtexmf/install-sh
catalogue-ctan /support/mkjobtexmf
catalogue-date 2011-11-16 11:07:17 +0100
-catalogue-license artistic
+catalogue-license gpl
catalogue-version 0.8
name mkjobtexmf.i386-linux
@@ -87188,7 +87067,7 @@
catalogue-license lppl1.3
catalogue-version 1.2.2
@ -264,6 +282,24 @@
name pst-lens
category Package
@@ -120511,7 +120390,7 @@
texmf/doc/man/man1/texdiff.man1.pdf
catalogue-ctan /support/texdiff
catalogue-date 2009-11-10 00:58:07 +0100
-catalogue-license artistic
+catalogue-license gpl
catalogue-version 0.4
name texdiff.i386-linux
@@ -120538,7 +120417,7 @@
texmf/doc/man/man1/texdirflatten.man1.pdf
catalogue-ctan /support/texdirflatten
catalogue-date 2012-01-12 19:29:56 +0100
-catalogue-license artistic
+catalogue-license gpl
catalogue-version 1.1
name texdirflatten.i386-linux
@@ -122079,7 +121958,6 @@
revision 13663
shortdesc i386-linux files of texlive-scripts