OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2003 13:06:41
Branch: HEAD Handle: 2003021612064100
Modified files:
openpkg-src/tetex tetex.spec
Log:
avoid conflicts with texinfo and coreutils
Summary:
Revision Changes Path
1.39 +17 -0 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 tetex.spec
--- openpkg-src/tetex/tetex.spec 16 Feb 2003 09:04:53 -0000 1.38
+++ openpkg-src/tetex/tetex.spec 16 Feb 2003 12:06:41 -0000 1.39
@@ -207,14 +207,31 @@
-e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};g" \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/*.1
+ # readlink utility conflicts with readlink from coreutils
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/readlink \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/tetex-readlink
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/readlink.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/tetex-readlink.1
+ %{l_shtool} subst \
+ -e 's;readlink;tetex-readlink;g' \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/mktexlsr \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/texhash
+
# cleanup the installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/install-info
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/makeinfo
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/texi2dvi
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/texindex
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/info
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/infokey
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/info*
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/texinfo*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/install-info.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/makeinfo.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/texi2dvi.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/texindex.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/info.1
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
