SPECS: texlive.spec - more BR; some fixes

[arekm]

Author: arekm                        Date: Tue Nov 25 20:19:05 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more BR; some fixes

---- Files affected:
SPECS:
   texlive.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.4 SPECS/texlive.spec:1.5
--- SPECS/texlive.spec:1.4	Tue Nov 25 21:04:38 2008
+++ SPECS/texlive.spec	Tue Nov 25 21:18:59 2008
@@ -40,8 +40,11 @@
 URL:		http://www.tug.org/texlive/
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	clisp
 BuildRequires:	ed
+BuildRequires:	expat-devel
 BuildRequires:	flex
+BuildRequires:	fontconfig-devel
 BuildRequires:	gd-devel >= 2.0.33
 BuildRequires:	libpng-devel >= 1.2.8
 BuildRequires:	libstdc++-devel
@@ -51,7 +54,11 @@
 BuildRequires:	t1lib-devel >= 5.0.2
 BuildRequires:	texinfo
 BuildRequires:	unzip
+BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	zlib-devel >= 1.2.1
 Requires:	%{name}-dirs-fonts
 Requires:	%{name}-fonts-cm = %{epoch}:%{version}-%{release}
@@ -3085,37 +3092,21 @@
 %prep
 %setup -q -c -T -n %{name}-%{version}-source
 lzma -dc %{SOURCE0} | tar xf - -C ..
-# install -d texmf
-# tar xzf %{SOURCE1} -C texmf
-
-# xltxtra in XeTeX needs fixltx2e >= 2006/03/24
-# cp -a %{SOURCE8} texmf/tex/latex/base
-
-#%patch0 -p1
-##%patch1  -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p1
-#%patch11 -p1
 
 %build
 find . -name "config.sub" -exec cp /usr/share/automake/config.sub '{}' ';'
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
-%configure2_13 \
+%configure \
 	--disable-multiplatform \
 	--disable-static \
 	--enable-a4 \
 	--enable-gf \
 	--enable-ipc \
 	--enable-shared \
+	--with-fontconfig \
 	--with-fonts-dir=/var/cache/fonts \
 	--with-ncurses \
+	--with-system-freetype2 \
 	--with-system-gd \
 	--with-system-ncurses \
 	--with-system-pnglib \
@@ -3127,25 +3118,8 @@
 	--without-t1utils \
 	--without-texinfo
 
-rm -f texk/{tetex,dvipsk}/*.info*
-cd texk/dvipsk
-makeinfo dvips.texi
-cd ../..
-
-cd texk/tetex
-makeinfo latex2e.texi
-cd ../..
-
 %{__make}
 
-cd texk/kpathsea
-makeinfo kpathsea.texi
-cd ../..
-
-cd texk/web2c/doc
-makeinfo web2c.texi
-cd ../../..
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir} \
@@ -6145,6 +6119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008/11/25 20:18:59  arekm
+- more BR; some fixes
+
 Revision 1.4  2008/11/25 20:04:38  uzsolt
 - delete Epoch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.4&r2=1.5&f=u