OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jul-2004 11:55:42
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/tetex tetex.spec
Removed files:
openpkg-src/tetex tetex.patch
Log:
changed usage of zlib and png from internal to system because of
Security Fix (CAN-2002-1363) for png
Summary:
Revision Changes Path
1.4 +0 -47 openpkg-src/tetex/tetex.patch
1.55 +10 -6 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
rm -f openpkg-src/tetex/tetex.patch <<'@@ .'
Index: openpkg-src/tetex/tetex.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 tetex.spec
--- openpkg-src/tetex/tetex.spec 29 Apr 2004 15:06:59 -0000 1.54
+++ openpkg-src/tetex/tetex.spec 2 Jul 2004 09:55:42 -0000 1.55
@@ -39,7 +39,7 @@
Group: Text
License: GPL
Version: %{V_src}
-Release: 20040429
+Release: 20040702
# package options
%option with_x11 no
@@ -49,13 +49,12 @@
Source1:
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-texmf-%{V_texmf}.tar.gz
Source2: http://www.tei-c.org.uk/Software/passivetex/passivetex.zip
Source3: ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex/base.zip
-Patch0: tetex.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, infozip, flex, bison
-PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, infozip, flex, bison, png,
zlib
+PreReq: OpenPKG, openpkg >= 20040130, perl, png, zlib
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
@@ -90,7 +89,6 @@
%prep
%setup -q -n tetex-src-%{V_src}
- %patch
# teTeX requires the texmf stuff to be already in place
# for building and installing the source parts.
@@ -187,7 +185,13 @@
--without-x11win \
%endif
--disable-multiplatform \
- --enable-gf
+ --enable-gf \
+ --with-system-pnglib \
+ --with-pnglib-libdir=%{l_prefix}/lib \
+ --with-pnglib-include=%{l_prefix}/include \
+ --with-system-zlib \
+ --with-zlib-libdir=%{l_prefix}/lib \
+ --with-zlib-include=%{l_prefix}/include
( cd texk/kpathsea
%{l_shtool} subst -v \
-e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
