OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 21-May-2009 11:54:48 Branch: HEAD Handle: 2009052110544700 Modified files: openpkg-src/tetex tetex.spec Log: remove obsolete substs and fix building under RPM 5 where %install automatically removed RPM_BUILD_ROOT Summary: Revision Changes Path 1.80 +9 -3 openpkg-src/tetex/tetex.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/tetex/tetex.spec ============================================================================ $ cvs diff -u -r1.79 -r1.80 tetex.spec --- openpkg-src/tetex/tetex.spec 18 Apr 2009 13:16:43 -0000 1.79 +++ openpkg-src/tetex/tetex.spec 21 May 2009 09:54:47 -0000 1.80 @@ -39,7 +39,7 @@ Group: Typesetting License: GPL Version: %{V_src} -Release: 20080101 +Release: 20090521 # package options %option with_x11 no @@ -150,8 +150,6 @@ ) || exit $? # minor fixes to the teTeX sources - %{l_shtool} subst -e "s;\|O_SYNC;;g" libs/libwww/HTMemLog.c - %{l_shtool} subst -e "s;strnstr;my_strnstr;g" libs/libwww/HTReader.c %{l_shtool} subst \ -e '1s;/usr/bin/perl;/usr/bin/env perl;' \ texk/*/t1mapper @@ -218,6 +216,14 @@ eval "make all" %install + # reinstall teTeX texmf stuff + # (because RPM 5 implicitly removes $RPM_BUILD_ROOT at begin of %install) + rm -rf $RPM_BUILD_ROOT + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/share/texmf + %{l_gzip} -d -c %{SOURCE tetex-texmf-%{V_texmf}.tar.gz} |\ + ( umask 0 && cd $RPM_BUILD_ROOT%{l_prefix}/share/texmf && %{l_tar} xf - ) || exit $? + # perform the standard installation procdure of teTeX # (we cannot use %{l_make}, because teTeX dislikes absolute paths # for make. Instead we work-around via $PATH. The redundant @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org