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.
monkey-patch the correct perl dependency into pkgbuild.spec
authorGuido Berhoerster <gber@openindiana.org>
Thu, 26 May 2011 21:57:31 +0200
changeset 4 d4aca3627be2
parent 3 c50f4ab9dab8
child 5 50e42deb7bb2
monkey-patch the correct perl dependency into pkgbuild.spec
patches/desktop-cbe-mini-02-pkgbuild-patches.patch file | annotate | diff | comparison | revisions 
--- a/patches/desktop-cbe-mini-02-pkgbuild-patches.patch	Sat Apr 16 13:47:23 2011 +0200
+++ b/patches/desktop-cbe-mini-02-pkgbuild-patches.patch	Thu May 26 21:57:31 2011 +0200
@@ -1,12 +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	2010-07-14 15:24:39.000000000 +0200
-+++ desktop-cbe-mini-1.8.0/mini-cbe-install	2010-11-02 13:35:10.000000000 +0100
-@@ -919,8 +919,10 @@
+--- 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
+@@ -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 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
@@ -15,7 +16,7 @@
      cd /tmp || return 1
 diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-01-add-unknown-dependencies.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-01-add-unknown-dependencies.patch
 --- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-01-add-unknown-dependencies.patch	1970-01-01 01:00:00.000000000 +0100
-+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-01-add-unknown-dependencies.patch	2010-11-02 13:35:10.000000000 +0100
++++ desktop-cbe-mini-1.8.0/patches/pkgbuild-01-add-unknown-dependencies.patch	2011-05-06 15:15:00.000000000 +0200
 @@ -0,0 +1,13 @@
 +diff -ur pkgbuild-1.3.103.orig/pkgbuild.pl.in pkgbuild-1.3.103/pkgbuild.pl.in
 +--- pkgbuild-1.3.103.orig/pkgbuild.pl.in	2010-07-12 04:56:34.000000000 +0200
@@ -32,7 +33,7 @@
 + 
 diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-02-nopkg.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-02-nopkg.patch
 --- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-02-nopkg.patch	1970-01-01 01:00:00.000000000 +0100
-+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-02-nopkg.patch	2010-11-02 13:45:19.000000000 +0100
++++ desktop-cbe-mini-1.8.0/patches/pkgbuild-02-nopkg.patch	2011-05-06 15:15:00.000000000 +0200
 @@ -0,0 +1,182 @@
 +diff -ur pkgbuild-1.3.103.orig/pkgtool.pl pkgbuild-1.3.103/pkgtool.pl
 +--- pkgbuild-1.3.103.orig/pkgtool.pl	2010-07-14 13:03:12.000000000 +0200
@@ -218,7 +219,7 @@
 +     if (defined($rpm_target)) {
 diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-03-forcefully-copy-docs.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-03-forcefully-copy-docs.patch
 --- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-03-forcefully-copy-docs.patch	1970-01-01 01:00:00.000000000 +0100
-+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-03-forcefully-copy-docs.patch	2010-11-02 13:46:45.000000000 +0100
++++ desktop-cbe-mini-1.8.0/patches/pkgbuild-03-forcefully-copy-docs.patch	2011-05-06 15:15:00.000000000 +0200
 @@ -0,0 +1,13 @@
 +diff -ur pkgbuild-1.3.103.orig/pkgbuild.pl.in pkgbuild-1.3.103/pkgbuild.pl.in
 +--- pkgbuild-1.3.103.orig/pkgbuild.pl.in	2010-11-02 13:39:24.000000000 +0100
@@ -235,7 +236,7 @@
 +Only in pkgbuild-1.3.103: pkgbuild.pl.in.orig
 diff -urN desktop-cbe-mini-1.8.0.orig/pkgbuild-add-patches.patch desktop-cbe-mini-1.8.0/pkgbuild-add-patches.patch
 --- desktop-cbe-mini-1.8.0.orig/pkgbuild-add-patches.patch	1970-01-01 01:00:00.000000000 +0100
-+++ desktop-cbe-mini-1.8.0/pkgbuild-add-patches.patch	2010-11-02 13:54:45.000000000 +0100
++++ desktop-cbe-mini-1.8.0/pkgbuild-add-patches.patch	2011-05-06 15:15:00.000000000 +0200
 @@ -0,0 +1,23 @@
 +diff -ur pkgbuild-1.3.103.orig/pkgbuild.spec pkgbuild-1.3.103/pkgbuild.spec
 +--- pkgbuild-1.3.103.orig/pkgbuild.spec	2010-07-14 12:53:27.000000000 +0200
oi-cbe