Mercurial Mercurial > oi-cbe / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed sed expression to not use a slash as a delimitier, this was inadvertently introducedy by the last changeset default tip
authorGuido Berhoerster <gber@openindiana.org>
Thu, 02 Jun 2011 13:16:55 +0200
changeset 7 2c25c60717b0
parent 6 25ef87909474
fixed sed expression to not use a slash as a delimitier, this was inadvertently introducedy by the last changeset
patches/desktop-cbe-mini-02-pkgbuild-patches.patch file | annotate | diff | comparison | revisions 
--- a/patches/desktop-cbe-mini-02-pkgbuild-patches.patch	Tue May 31 23:56:58 2011 +0200
+++ b/patches/desktop-cbe-mini-02-pkgbuild-patches.patch	Thu Jun 02 13:16:55 2011 +0200
@@ -1,13 +1,13 @@
 diff -urN desktop-cbe-mini-1.8.0.orig/mini-cbe-install desktop-cbe-mini-1.8.0/mini-cbe-install
 --- desktop-cbe-mini-1.8.0.orig/mini-cbe-install	2011-05-06 15:14:34.000000000 +0200
-+++ desktop-cbe-mini-1.8.0/mini-cbe-install	2011-05-06 15:16:46.000000000 +0200
++++ desktop-cbe-mini-1.8.0/mini-cbe-install	2011-06-02 13:11:33.000000000 +0200
 @@ -919,8 +919,11 @@
      msg "Please be patient, this may take a couple of minutes."
      logrun mkdir -p $tmp_build_dir/packages/SOURCES || return 1
      logrun ln -s $tardir/pkgbuild-$PKGBUILD_VERSION.tar.bz2 $tmp_build_dir/packages/SOURCES/ || return 1
 +    logrun cp $mydir/patches/pkgbuild-*.patch $tmp_build_dir/packages/SOURCES/ || return 1
 +    logrun patch -p1 < $mydir/pkgbuild-add-patches.patch || return 1
-+    logrun bash -c 'perl_package="$(pkg search -l -H -o pkg.name "link::/usr/bin/perl OR file::/usr/bin/perl" 2>/dev/null)"; sed "s/^Requires:     SUNWperl584core/Requires: ${perl_package:-SUNWperl584core}/" pkgbuild.spec > pkgbuild.spec.$$ && mv pkgbuild.spec.$$ pkgbuild.spec' || return 1
++    logrun bash -c 'perl_package="$(pkg search -l -H -o pkg.name "link::/usr/bin/perl OR file::/usr/bin/perl" 2>/dev/null)"; sed "s|^Requires:     SUNWperl584core|Requires: ${perl_package:-SUNWperl584core}|" pkgbuild.spec > pkgbuild.spec.$$ && mv pkgbuild.spec.$$ pkgbuild.spec' || return 1
      logrun cp -pr $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/COPYING $tmp_build_dir/packages/SOURCES/gpl-2.0.txt || return 1
 -    logrun_quiet bash -c "$tmp_build_dir/bin/pkgtool --src $tmp_build_dir/packages/SOURCES --nonotify --define \"pkgbuild_prefix /usr\" --define \"_topdir $tmp_build_dir/packages\" build --update-if-newer $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/pkgbuild.spec" || return 1
 +    logrun_quiet bash -c "$tmp_build_dir/bin/pkgtool --src $tmp_build_dir/packages/SOURCES --patches $tmp_build_dir/packages/SOURCES --nonotify --define \"pkgbuild_prefix /usr\" --define \"_topdir $tmp_build_dir/packages\" build --update-if-newer $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/pkgbuild.spec" || return 1
oi-cbe