Couple of bugfixes.
This commit is contained in:
Jindrich Novy
parent
1b033d6a69
commit
d7af6e634c
|
|
@ -12,10 +12,10 @@ touch _mkdirs.spec
|
|||
if [ -d 2011 ]; then
|
||||
grep ^name texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2012
|
||||
grep ^name 2011/texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2011
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/ < %{tl_version}/' > _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-doc < %{tl_version}/' >> _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-fedora-fonts < %{tl_version}/' >> _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-bin < %{tl_version}/' >> _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/ < 3:%{tl_version}/' > _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-doc < 3:%{tl_version}/' >> _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-fedora-fonts < 3:%{tl_version}/' >> _obsoletes.spec
|
||||
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-bin < 3:%{tl_version}/' >> _obsoletes.spec
|
||||
rm -f /tmp/tl2011 /tmp/tl2012
|
||||
fi
|
||||
mv _mkdirs.spec _mkdirs.spec.tmp
|
||||
|
|
|
|||
3220
texlive.spec
3220
texlive.spec
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
%global source_date 20131010_r31872
|
||||
%global tl_version 2013
|
||||
%global tl_rel 0.6
|
||||
%global tl_rel 0.6.1
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
|
|
@ -8,9 +8,6 @@
|
|||
%{!?_texdir: %global _texdir %{_datadir}/%{name}}
|
||||
%{!?_texmf_var: %global _texmf_var %{_var}/lib/texmf}
|
||||
|
||||
# don't figure any perl requires
|
||||
%global __perl_requires %{nil}
|
||||
%global __find_provides %{nil}
|
||||
%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
|
||||
%global __arch_install_post %{nil}
|
||||
|
||||
|
|
@ -367,9 +364,21 @@ fi
|
|||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Mon Oct 7 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20131007
|
||||
- sync with upstream
|
||||
- modify post scripts
|
||||
* Mon Oct 11 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20131010
|
||||
- sync with upstream - fixes metapost, siunitx, latexdiff, luatex
|
||||
(#1016074, #1013367, #981390, #975254, #976863)
|
||||
- modify post scripts (#968573)
|
||||
- fix kpathsea patch
|
||||
- fix euler fonts installation (#982887)
|
||||
- fix license tag OFSFLD -> OFL (#1014052)
|
||||
- process perl dependencies (#1001434)
|
||||
- don't ship flash files (#1000265)
|
||||
- rebuild should fix rawhide poppler deps (#998696)
|
||||
- fixes build of dbus-java (#993438)
|
||||
- texexec no more complains about switch.rb (#993255)
|
||||
- bin packages now require their counterparts (#991699, #988978, #984468)
|
||||
- bibtex works fine now with spanish (#987534)
|
||||
- do proper obsoletion - include epoch (#983433)
|
||||
|
||||
* Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
|
||||
- formally switch to 2013 based on upstream
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
diff -up source/texk/kpathsea/progname.c.orig source/texk/kpathsea/progname.c
|
||||
--- source/texk/kpathsea/progname.c.orig 2012-03-12 10:13:40.000000000 +0100
|
||||
+++ source/texk/kpathsea/progname.c 2012-03-12 11:05:58.858157925 +0100
|
||||
@@ -667,7 +667,7 @@ kpathsea_set_program_name (kpathsea kpse
|
||||
diff -up texlive-2013/source/texk/kpathsea/progname.c.kpfix texlive-2013/source/texk/kpathsea/progname.c
|
||||
--- source/texk/kpathsea/progname.c.kpfix 2013-08-12 09:28:14.422522624 +0200
|
||||
+++ source/texk/kpathsea/progname.c 2013-08-12 12:16:02.958132658 +0200
|
||||
@@ -668,7 +668,7 @@ kpathsea_set_program_name (kpathsea kpse
|
||||
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
|
||||
sdir_parent = xdirname (sdir);
|
||||
kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
|
||||
- sdir_grandparent = xdirname (sdir_parent);
|
||||
+ sdir_grandparent = strdup("/usr/share/texlive");
|
||||
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
|
||||
|
||||
#if defined(WIN32) || defined(__CYGWIN__)
|
||||
sdir_greatgrandparent = xdirname (sdir_grandparent);
|
||||
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
|
||||
|
|
|
|||
32
tl2rpm.c
32
tl2rpm.c
|
|
@ -42,6 +42,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -151,7 +152,7 @@ match spec_license[] = {
|
|||
{"Public Domain", LIC_COLLECTION},
|
||||
{"Artistic", LIC_ARTISTIC},
|
||||
{"Other", LIC_OTHER},
|
||||
{"OFSFLD", LIC_OFL},
|
||||
{"OFL", LIC_OFL},
|
||||
{"ASL 2.0", LIC_APACHE2},
|
||||
{"No Source", LIC_NOSOURCE},
|
||||
{"No Sell", LIC_NOSOURCE},
|
||||
|
|
@ -697,7 +698,8 @@ void append_filelist( char *pkg, char *pkgsuf, int files, char **filelist, char
|
|||
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], "mswin") ||
|
||||
strstr(&filelist[n][bin_index], "Win32") || strstr(&filelist[n][bin_index], "tlmgr") ||
|
||||
!strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18)) {
|
||||
!strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18) ||
|
||||
strstr(&filelist[n][bin_index], ".swf")) {
|
||||
fprintf(fremove, "rm -f %%{buildroot}/%s/%s\n", bin?"%{_bindir}":"%{_texdir}", &filelist[n][bin_index]);
|
||||
printf("*** %s\n", &filelist[n][bin_index]);
|
||||
goto next;
|
||||
|
|
@ -1076,6 +1078,12 @@ static char *print_noarch_version( package *p ) {
|
|||
return noarchver;
|
||||
}
|
||||
|
||||
static char *skipspaces( char *s ) {
|
||||
while ( isblank(*s) ) s++;
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
int level;
|
||||
void solve(char *name) {
|
||||
unsigned long h;
|
||||
|
|
@ -1301,7 +1309,10 @@ void solve(char *name) {
|
|||
}
|
||||
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(fpack, "BuildArch: noarch\n");
|
||||
if (!strcmp(name,"pdfcrop")) {
|
||||
fprintf(fpack, "AutoReqProv: No\n");
|
||||
}
|
||||
fprintf(fsrc, "Source%04d: "CTAN_URL"%s.tar."UNPACK"\n", srcno++, name);
|
||||
if ( pkg[i].has_man || pkg[i].has_info ) {
|
||||
char nm[0x100];
|
||||
|
|
@ -1573,17 +1584,17 @@ void solve(char *name) {
|
|||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable Map=%s"REDIR, &pkg[i].exe[n][7]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable Map=%s"REDIR, skipspaces(&pkg[i].exe[n][7]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable MixedMap=%s"REDIR, &pkg[i].exe[n][12]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable MixedMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable KanjiMap=%s"REDIR, &pkg[i].exe[n][12]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable KanjiMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1699,17 +1710,17 @@ void solve(char *name) {
|
|||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable Map=%s"REDIR, &pkg[i].exe[n][7]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable Map=%s"REDIR, skipspaces(&pkg[i].exe[n][7]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable MixedMap=%s"REDIR, &pkg[i].exe[n][12]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable MixedMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable KanjiMap=%s"REDIR, &pkg[i].exe[n][12]);
|
||||
fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable KanjiMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
|
||||
run_updmap = 1;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -2060,7 +2071,8 @@ void solve(char *name) {
|
|||
fprintf(fpack, "Summary: Binaries for %s\n", name);
|
||||
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");
|
||||
if ( main_written ) fprintf(fpack, "Requires: tex-%s\n", name); else printf("!%s\n", name);
|
||||
// if ( main_written ) fprintf(fpack, "Requires: tex-%s\n", name); else printf("!%s\n", name);
|
||||
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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue