pool/texlive
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 174720 from Publishing:TeXLive

Browse Source 
- 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.

- 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.

- 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.

OBS-URL: https://build.opensuse.org/request/show/174720
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=6
This commit is contained in:
Stephan Kulow
2013-05-13 13:44:26 +00:00
committed by Git OBS Bridge
parent 93f7b6325d 32ce7d5e92
commit 47d8ad413a
4 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public.c
View File

@@ -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" },

21
source-asymptote.dif Normal file
View File

@@ -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()

26
texlive.changes
View File

@@ -1,3 +1,29 @@
-------------------------------------------------------------------
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
- 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
- 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

54
texlive.spec
View File

@@ -17,8 +17,9 @@
%define texlive_version 2012
%define texlive_previous 2011
%define texlive_release 20120611
%define texlive_noarch 61
%define texlive_noarch 65
%define texlive_source texlive-20120611-source
%define __perl_requires %{nil}
@@ -39,6 +40,12 @@
%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
%global with_lcdf_typetools 1
%bcond_with lcdf_typetools
Name: texlive
Version: %{texlive_version}.%{texlive_release}
Release: 0
@@ -101,6 +108,7 @@ BuildRequires: ghostscript-library
BuildRequires: glibc-devel
BuildRequires: gsl-devel
BuildRequires: jpeg
BuildRequires: kernel-devel
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -177,6 +185,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)}
@@ -324,6 +333,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}
@@ -433,8 +443,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_version}
Obsoletes: texlive-bin-cjk <= %{texlive_previous}
Prefix: %{_bindir}
%description cjkutils-bin
@@ -639,8 +648,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_version}
Obsoletes: texlive-bin-dvilj <= %{texlive_previous}
Prefix: %{_bindir}
%description dviljk-bin
@@ -881,8 +889,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_version}
Obsoletes: texlive-bin-jadetex <= %{texlive_previous}
Prefix: %{_bindir}
%description jadetex-bin
@@ -939,8 +946,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_version}
Obsoletes: texlive-bin-latex <= %{texlive_previous}
Prefix: %{_bindir}
%description latex-bin-bin
@@ -1001,6 +1007,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
@@ -1109,8 +1120,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_version}
Obsoletes: texlive-bin-metapost <= %{texlive_previous}
Prefix: %{_bindir}
%description metapost-bin
@@ -1207,8 +1217,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_version}
Obsoletes: texlive-bin-musictex <= %{texlive_previous}
Prefix: %{_bindir}
%description musixtex-bin
@@ -1221,10 +1230,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_version}
Obsoletes: texlive-bin-omega <= %{texlive_previous}
Prefix: %{_bindir}
%description omegaware-bin
@@ -1501,8 +1507,8 @@ 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_version}
Obsoletes: texlive-bin-tex4ht <= %{texlive_previous}
Conflicts: ht
Prefix: %{_bindir}
%description tex4ht-bin
@@ -1767,8 +1773,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_version}
Obsoletes: texlive-bin-xetex <= %{texlive_previous}
Prefix: %{_bindir}
%description xetex-bin
@@ -1781,8 +1786,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_version}
Obsoletes: texlive-bin-xmltex <= %{texlive_previous}
Prefix: %{_bindir}
%description xmltex-bin
@@ -2030,6 +2034,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
@@ -2124,6 +2129,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 \
@@ -2867,6 +2873,7 @@ VERBOSE=false %{_texmfmaindir}/texconfig/update || :
%files lcdftypetools-bin
%defattr(-,root,root,755)
%if %{with lcdf_typetools}
%{_bindir}/cfftot1
%{_bindir}/mmafm
%{_bindir}/mmpfb
@@ -2878,6 +2885,7 @@ VERBOSE=false %{_texmfmaindir}/texconfig/update || :
%{_bindir}/t1reencode
%{_bindir}/t1testpage
%{_bindir}/ttftotype42
%endif
%files listbib-bin
%defattr(-,root,root,755)