.

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=122

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)