OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2003 21:24:29
Branch: HEAD Handle: 2003031220242800
Modified files:
openpkg-src/xfig xfig.spec
Log:
fix substitutions: newline in sed commands is not portable
Summary:
Revision Changes Path
1.6 +3 -2 openpkg-src/xfig/xfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xfig/xfig.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 xfig.spec
--- openpkg-src/xfig/xfig.spec 12 Mar 2003 17:36:21 -0000 1.5
+++ openpkg-src/xfig/xfig.spec 12 Mar 2003 20:24:28 -0000 1.6
@@ -61,8 +61,8 @@
# configure package
X11BINDIR=`%{l_prefix}/etc/rc --query x11_bindir`
%{l_shtool} subst \
- -e "s;^XCOMM \(BINDIR =\).*$;DESTDIR = \"$RPM_BUILD_ROOT\"\n\1
%{l_prefix}/libexec/xfig;" \
- -e "s;^XCOMM \(MKDIRHIER =\).*$;\1 $X11BINDIR/mkdirhier;" \
+ -e 's;^XCOMM \(BINDIR =\).*$;\1 %{l_prefix}/libexec/xfig;' \
+ -e "s;^XCOMM \\(MKDIRHIER =\\).*\$;\\1 $X11BINDIR/mkdirhier;" \
-e 's;^XCOMM \(XAPPLOADDIR =\) .*$;\1 %{l_prefix}/etc/X11/app-defaults;' \
-e 's;^\(XFIGLIBDIR =\) .*$;\1 %{l_prefix}/lib/X11/xfig;' \
-e 's;^\(PNGLIBDIR =\) .*$;\1 %{l_prefix}/lib;' \
@@ -78,6 +78,7 @@
-e 's;^\(#define I18N\)$;XCOMM \1;' \
-e 's;^XCOMM \(USEINLINE = .*\)$;\1;' \
Imakefile
+ echo "DESTDIR = \"$RPM_BUILD_ROOT\"" >>Imakefile
X11BINDIR="`%{l_prefix}/etc/rc --query x11_bindir`"
export PATH="$PATH:$X11BINDIR"
$X11BINDIR/xmkmf -a
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
