From 56949c4d346a89e83aa2bf2c9afc08fae5356ec719615295266300cd26273009 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 27 Mar 2013 13:24:09 +0000 Subject: [PATCH 1/5] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=119 --- public.c | 1 + texlive.changes | 9 +++++++++ texlive.spec | 24 +++++++++++++----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/public.c b/public.c index 3507604..995c6dc 100644 --- a/public.c +++ b/public.c @@ -58,6 +58,7 @@ static struct { { "mktexlsr", MKTEX "/mktexlsr" }, { "mktexmf", MKTEX "/mktexmf" }, { "mktexpk", MKTEX "/mktexpk" }, + { "mktextex", MKTEX "/mktextex" }, { "mktextfm", MKTEX "/mktextfm" }, { "false", "/bin/false" }, { "true", "/bin/true" }, diff --git a/texlive.changes b/texlive.changes index 30aff61..9b3bf05 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 27 13:23:46 UTC 2013 - werner@suse.de + +- Change Obsoletes from < 2012+subversion to <= 2011 (bnc#811162) +- Let mathdesign require tex(texnansi.enc) (bnc#808731) +- Let biber-bin require perl(Text::BibTeX) (bnc#811258) +- Do not require xfs as we do not use xfs at all, otherwise we + have to add some more lua code in the %post scriptlet. + ------------------------------------------------------------------- Thu Feb 21 14:02:39 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index 142e95c..3f0ae11 100644 --- a/texlive.spec +++ b/texlive.spec @@ -17,8 +17,9 @@ %define texlive_version 2012 +%define texlive_previous 2011 %define texlive_release 20120611 -%define texlive_noarch 61 +%define texlive_noarch 63 %define texlive_source texlive-20120611-source %define __perl_requires %{nil} @@ -324,6 +325,7 @@ Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ %if %{with buildbiber} Requires: perl = %{perl_version} +Requires: perl(Text::BibTeX) %endif Prefix: %{_bindir} @@ -434,7 +436,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-cjk = %{texlive_version} -Obsoletes: texlive-bin-cjk < %{texlive_version} +Obsoletes: texlive-bin-cjk <= %{texlive_previous} Prefix: %{_bindir} %description cjkutils-bin @@ -640,7 +642,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-dvilj = %{texlive_version} -Obsoletes: texlive-bin-dvilj < %{texlive_version} +Obsoletes: texlive-bin-dvilj <= %{texlive_previous} Prefix: %{_bindir} %description dviljk-bin @@ -882,7 +884,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-jadetex = %{texlive_version} -Obsoletes: texlive-bin-jadetex < %{texlive_version} +Obsoletes: texlive-bin-jadetex <= %{texlive_previous} Prefix: %{_bindir} %description jadetex-bin @@ -940,7 +942,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-latex = %{texlive_version} -Obsoletes: texlive-bin-latex < %{texlive_version} +Obsoletes: texlive-bin-latex <= %{texlive_previous} Prefix: %{_bindir} %description latex-bin-bin @@ -1110,7 +1112,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-metapost = %{texlive_version} -Obsoletes: texlive-bin-metapost < %{texlive_version} +Obsoletes: texlive-bin-metapost <= %{texlive_previous} Prefix: %{_bindir} %description metapost-bin @@ -1208,7 +1210,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-musictex = %{texlive_version} -Obsoletes: texlive-bin-musictex < %{texlive_version} +Obsoletes: texlive-bin-musictex <= %{texlive_previous} Prefix: %{_bindir} %description musixtex-bin @@ -1224,7 +1226,7 @@ Url: http://www.tug.org/texlive/ Provides: %{texlive_version} Provides: 0 Provides: texlive-bin-omega -Obsoletes: texlive-bin-omega < %{texlive_version} +Obsoletes: texlive-bin-omega <= %{texlive_previous} Prefix: %{_bindir} %description omegaware-bin @@ -1502,7 +1504,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-tex4ht = %{texlive_version} -Obsoletes: texlive-bin-tex4ht < %{texlive_version} +Obsoletes: texlive-bin-tex4ht <= %{texlive_previous} Prefix: %{_bindir} %description tex4ht-bin @@ -1768,7 +1770,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-xetex = %{texlive_version} -Obsoletes: texlive-bin-xetex < %{texlive_version} +Obsoletes: texlive-bin-xetex <= %{texlive_previous} Prefix: %{_bindir} %description xetex-bin @@ -1782,7 +1784,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-xmltex = %{texlive_version} -Obsoletes: texlive-bin-xmltex < %{texlive_version} +Obsoletes: texlive-bin-xmltex <= %{texlive_previous} Prefix: %{_bindir} %description xmltex-bin From 8e18878ef76bcb46521a2e347bcb8da958092f9e77cafd9c4306d456feee8b93 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 28 Mar 2013 13:27:56 +0000 Subject: [PATCH 2/5] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=120 --- texlive.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/texlive.spec b/texlive.spec index 3f0ae11..f39d876 100644 --- a/texlive.spec +++ b/texlive.spec @@ -436,7 +436,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-cjk = %{texlive_version} -Obsoletes: texlive-bin-cjk <= %{texlive_previous} Prefix: %{_bindir} %description cjkutils-bin @@ -642,7 +641,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-dvilj = %{texlive_version} -Obsoletes: texlive-bin-dvilj <= %{texlive_previous} Prefix: %{_bindir} %description dviljk-bin @@ -884,7 +882,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-jadetex = %{texlive_version} -Obsoletes: texlive-bin-jadetex <= %{texlive_previous} Prefix: %{_bindir} %description jadetex-bin @@ -942,7 +939,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-latex = %{texlive_version} -Obsoletes: texlive-bin-latex <= %{texlive_previous} Prefix: %{_bindir} %description latex-bin-bin @@ -1112,7 +1108,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-metapost = %{texlive_version} -Obsoletes: texlive-bin-metapost <= %{texlive_previous} Prefix: %{_bindir} %description metapost-bin @@ -1210,7 +1205,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-musictex = %{texlive_version} -Obsoletes: texlive-bin-musictex <= %{texlive_previous} Prefix: %{_bindir} %description musixtex-bin @@ -1223,10 +1217,7 @@ Summary: Binary files of omegaware License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: %{texlive_version} -Provides: 0 -Provides: texlive-bin-omega -Obsoletes: texlive-bin-omega <= %{texlive_previous} +Provides: texlive-bin-omega = %{texlive_version} Prefix: %{_bindir} %description omegaware-bin @@ -1504,7 +1495,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-tex4ht = %{texlive_version} -Obsoletes: texlive-bin-tex4ht <= %{texlive_previous} Prefix: %{_bindir} %description tex4ht-bin @@ -1770,7 +1760,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-xetex = %{texlive_version} -Obsoletes: texlive-bin-xetex <= %{texlive_previous} Prefix: %{_bindir} %description xetex-bin @@ -1784,7 +1773,6 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Provides: texlive-bin-xmltex = %{texlive_version} -Obsoletes: texlive-bin-xmltex <= %{texlive_previous} Prefix: %{_bindir} %description xmltex-bin From ff8e1349c8a6ddbf78eaab470e058d20c40019e41bffa177421126c243297ffb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 28 Mar 2013 13:35:15 +0000 Subject: [PATCH 3/5] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=121 --- texlive.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/texlive.spec b/texlive.spec index f39d876..c5031eb 100644 --- a/texlive.spec +++ b/texlive.spec @@ -435,7 +435,7 @@ Summary: Binary files of cjkutils License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-cjk = %{texlive_version} +Obsoletes: texlive-bin-cjk <= %{texlive_previous} Prefix: %{_bindir} %description cjkutils-bin @@ -640,7 +640,7 @@ Summary: Binary files of dviljk License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-dvilj = %{texlive_version} +Obsoletes: texlive-bin-dvilj <= %{texlive_previous} Prefix: %{_bindir} %description dviljk-bin @@ -881,7 +881,7 @@ Summary: Binary files of jadetex License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-jadetex = %{texlive_version} +Obsoletes: texlive-bin-jadetex <= %{texlive_previous} Prefix: %{_bindir} %description jadetex-bin @@ -938,7 +938,7 @@ Summary: Binary files of latex-bin License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-latex = %{texlive_version} +Obsoletes: texlive-bin-latex <= %{texlive_previous} Prefix: %{_bindir} %description latex-bin-bin @@ -1107,7 +1107,7 @@ Summary: Binary files of metapost License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-metapost = %{texlive_version} +Obsoletes: texlive-bin-metapost <= %{texlive_previous} Prefix: %{_bindir} %description metapost-bin @@ -1204,7 +1204,7 @@ Summary: Binary files of musixtex License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-musictex = %{texlive_version} +Obsoletes: texlive-bin-musictex <= %{texlive_previous} Prefix: %{_bindir} %description musixtex-bin @@ -1217,7 +1217,7 @@ Summary: Binary files of omegaware License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-omega = %{texlive_version} +Obsoletes: texlive-bin-omega <= %{texlive_previous} Prefix: %{_bindir} %description omegaware-bin @@ -1494,7 +1494,7 @@ Summary: Binary files of tex4ht License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-tex4ht = %{texlive_version} +Obsoletes: texlive-bin-tex4ht <= %{texlive_previous} Prefix: %{_bindir} %description tex4ht-bin @@ -1759,7 +1759,7 @@ Summary: Binary files of xetex License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-xetex = %{texlive_version} +Obsoletes: texlive-bin-xetex <= %{texlive_previous} Prefix: %{_bindir} %description xetex-bin @@ -1772,7 +1772,7 @@ Summary: Binary files of xmltex License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ -Provides: texlive-bin-xmltex = %{texlive_version} +Obsoletes: texlive-bin-xmltex <= %{texlive_previous} Prefix: %{_bindir} %description xmltex-bin From 08eb2a6b04acdbf7273ed399a169ff4735863ab5cd963c0fae3be8257980885d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 6 May 2013 13:33:07 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=122 --- source-asymptote.dif | 21 +++++++++++++++++++++ texlive.changes | 10 ++++++++++ texlive.spec | 19 ++++++++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 source-asymptote.dif diff --git a/source-asymptote.dif b/source-asymptote.dif new file mode 100644 index 0000000..35ad2a6 --- /dev/null +++ b/source-asymptote.dif @@ -0,0 +1,21 @@ +--- utils/asymptote/interact.cc ++++ utils/asymptote/interact.cc 2013-05-03 10:25:51.255472000 +0000 +@@ -85,14 +85,10 @@ FILE *fin=NULL; + + char *readpipeline(const char *prompt) + { +- const int max_size=256; +- static char buf[max_size]; +- ostringstream s; +- do { +- if(fgets(buf,max_size-1,fin) == NULL) break; +- s << buf; +- } while(buf[strlen(buf)-1] != '\n'); +- return StrdupMalloc(s.str()); ++ char *line=NULL; ++ size_t n; ++ getline(&line,&n,fin); ++ return line; + } + + void pre_readline() diff --git a/texlive.changes b/texlive.changes index 9b3bf05..6ab08cf 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri May 3 09:53:07 UTC 2013 - werner@suse.de + +- Let texlive-pdfjam require texlive-pdfpages (bnc#814804) +- Let texlive-pdftools require texlive-pst-pdf (bnc#812286) +- Correct license boolean for biber packages +- Let texlive-tex4ht-bin conflict with ht due path /usr/bin/ht +- Let texlive-lcdftypetools(-bin) packages depend on lcdf-typetools + package or conflict. + ------------------------------------------------------------------- Wed Mar 27 13:23:46 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index c5031eb..7aa5a99 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ %define texlive_version 2012 %define texlive_previous 2011 %define texlive_release 20120611 -%define texlive_noarch 63 +%define texlive_noarch 65 %define texlive_source texlive-20120611-source %define __perl_requires %{nil} @@ -40,6 +40,11 @@ %global with_buildbiber 1 %bcond_with buildbiber +# +# lcdf-typetools -- is also available as the package lcdf-typetools +# and therefore we may only require this external package +%bcond_with lcdf_typetools + Name: texlive Version: %{texlive_version}.%{texlive_release} Release: 0 @@ -102,6 +107,7 @@ BuildRequires: ghostscript-library BuildRequires: glibc-devel BuildRequires: gsl-devel BuildRequires: jpeg +BuildRequires: kernel-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -178,6 +184,7 @@ Patch15: source-overflow.dif Patch17: source-64.dif Patch18: source-a2ping.dif Patch19: source-dvipng.dif +Patch20: source-asymptote.dif Prefix: %{_bindir} %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)} @@ -999,6 +1006,11 @@ Summary: Binary files of lcdftypetools License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ +%if %{with lcdf_typetools} +Conflicts: lcdf-typetools +%else +Requires: lcdf-typetools +%endif Prefix: %{_bindir} %description lcdftypetools-bin @@ -1495,6 +1507,7 @@ License: LPPL-1.0 Group: Productivity/Publishing/TeX/Utilities Url: http://www.tug.org/texlive/ Obsoletes: texlive-bin-tex4ht <= %{texlive_previous} +Conflicts: ht Prefix: %{_bindir} %description tex4ht-bin @@ -2020,6 +2033,7 @@ development packages for TeXLive. %patch17 -p0 -b .64 %patch18 -p0 -b .a2p %patch19 -p0 -b .dvipng +%patch20 -p0 -b .asymptote %patch0 # Correct FHS paths @@ -2114,6 +2128,7 @@ development packages for TeXLive. --disable-uptex \ --disable-euptex \ --%{!?with_psutils:disable}%{?with_psutils:enable}-psutils \ + --%{!?with_lcdf_typetools:disable}%{?with_lcdf_typetools:enable}-lcdf-typetools \ --enable-freetype \ --enable-musixflx \ --enable-lacheck \ @@ -2857,6 +2872,7 @@ VERBOSE=false %{_texmfmaindir}/texconfig/update || : %files lcdftypetools-bin %defattr(-,root,root,755) +%if %{with lcdf_typetools} %{_bindir}/cfftot1 %{_bindir}/mmafm %{_bindir}/mmpfb @@ -2868,6 +2884,7 @@ VERBOSE=false %{_texmfmaindir}/texconfig/update || : %{_bindir}/t1reencode %{_bindir}/t1testpage %{_bindir}/ttftotype42 +%endif %files listbib-bin %defattr(-,root,root,755) From 32ce7d5e9280636eb11c3b09789bf2a17e889307d70d8dc549fd272cea95eb76 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 7 May 2013 10:18:57 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=123 --- texlive.changes | 7 +++++++ texlive.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/texlive.changes b/texlive.changes index 6ab08cf..bf2ce7d 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 08:45:34 UTC 2013 - werner@suse.de + +- As lcdf-typetools does not support kpathsea nor search below + texmf tree build the texlive-lcdftypetools(-bin) packages again + and let them conflict with the lcdf-typetools package. + ------------------------------------------------------------------- Fri May 3 09:53:07 UTC 2013 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index 7aa5a99..de87a6f 100644 --- a/texlive.spec +++ b/texlive.spec @@ -43,6 +43,7 @@ # # lcdf-typetools -- is also available as the package lcdf-typetools # and therefore we may only require this external package +%global with_lcdf_typetools 1 %bcond_with lcdf_typetools Name: texlive