diff options
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20120615')
8 files changed, 198 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment-0001.html b/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment-0001.html new file mode 100644 index 000000000..2945798a5 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment-0001.html @@ -0,0 +1,5 @@ +<br><div class="gmail_quote">On Fri, Jun 15, 2012 at 2:45 PM, Sander Lepik <span dir="ltr"><<a href="mailto:sander.lepik@eesti.ee" target="_blank">sander.lepik@eesti.ee</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +It should be possible to run it on mga1 and mga2 too (i'm using it on mga2). But for that<br> +you have to get the rpm manually from cauldron's repo.<br> +<br></blockquote><div><br>I think this would be worth a backport to mga2 - a lot of people will look for it and most don't have a clue how to get stuff from Cauldron and that it is safe to do so (mixing Cauldron and stable being bad idea in general).<br> +<br>Regards,<br><br>Jan<br></div></div> diff --git a/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment.html b/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment.html new file mode 100644 index 000000000..2945798a5 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/3535fb62/attachment.html @@ -0,0 +1,5 @@ +<br><div class="gmail_quote">On Fri, Jun 15, 2012 at 2:45 PM, Sander Lepik <span dir="ltr"><<a href="mailto:sander.lepik@eesti.ee" target="_blank">sander.lepik@eesti.ee</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +It should be possible to run it on mga1 and mga2 too (i'm using it on mga2). But for that<br> +you have to get the rpm manually from cauldron's repo.<br> +<br></blockquote><div><br>I think this would be worth a backport to mga2 - a lot of people will look for it and most don't have a clue how to get stuff from Cauldron and that it is safe to do so (mixing Cauldron and stable being bad idea in general).<br> +<br>Regards,<br><br>Jan<br></div></div> diff --git a/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment-0001.obj new file mode 100644 index 000000000..e6c478a4a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment-0001.obj @@ -0,0 +1,80 @@ +diff -p -up rpm-4.10.0/build/parsePrep.c.2006 rpm-4.10.0/build/parsePrep.c +--- rpm-4.10.0/build/parsePrep.c.2006 2012-05-22 10:53:51.000000000 +0000 ++++ rpm-4.10.0/build/parsePrep.c 2012-06-15 09:17:31.945151263 +0000 +@@ -138,7 +138,10 @@ static char *doUntar(rpmSpec spec, uint3 + char *fn = NULL; + char *buf = NULL; + char *tar = NULL; +- const char *taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf"); ++ char taropts[8]; ++ char *t; ++ char *rubygemopts = NULL; ++ int rubygem = 0; + struct Source *sp; + rpmCompressedMagic compressed = COMPRESSED_NOT; + +@@ -158,6 +161,25 @@ static char *doUntar(rpmSpec spec, uint3 + + fn = rpmGetPath("%{_sourcedir}/", sp->source, NULL); + ++ t = strrchr(sp->source, '.'); ++ if(t && !strcasecmp(t, ".gem")) ++ rubygem = 1; ++ ++ t = stpcpy(taropts, "-x"); ++ if(rpmIsVerbose() && !quietly) ++ t = stpcpy(t, "vv"); ++ if(rubygem) ++ t = stpcpy(t, "m"); ++ t = stpcpy(t, "f"); ++ ++ if (rubygem) { ++ rasprintf(&rubygemopts, ++ "\n" ++ "if [ -f data.tar.gz ]; then\n" ++ " tar %s data.tar.gz\n" ++ "fi", taropts); ++ } ++ + /* XXX On non-build parse's, file cannot be stat'd or read */ + if (!(spec->flags & RPMSPEC_FORCE) && (rpmFileIsCompressed(fn, &compressed) || checkOwners(fn))) { + goto exit; +@@ -204,7 +226,7 @@ static char *doUntar(rpmSpec spec, uint3 + "STATUS=$?\n" + "if [ $STATUS -ne 0 ]; then\n" + " exit $STATUS\n" +- "fi", zipper, fn, tar, taropts); ++ "fi%s", zipper, fn, tar, taropts, rubygem ? rubygemopts : ""); + } else { + rasprintf(&buf, "%s '%s'\n" + "STATUS=$?\n" +@@ -214,7 +236,7 @@ static char *doUntar(rpmSpec spec, uint3 + } + free(zipper); + } else { +- rasprintf(&buf, "%s %s %s", tar, taropts, fn); ++ rasprintf(&buf, "%s %s %s%s", tar, taropts, fn, rubygem ? rubygemopts : ""); + } + + exit: +@@ -316,6 +338,20 @@ static int doSetupMacro(rpmSpec spec, co + free(buf); + } + ++ /* check if source is a ruby gem */ ++ { struct Source *sp; ++ for (sp = spec->sources; sp != NULL; sp = sp->next) { ++ if ((sp->flags & RPMBUILD_ISSOURCE) && (sp->num == 0)) { ++ break; ++ } ++ } ++ if (sp != NULL) { ++ char *t = strrchr(sp->source, '.'); ++ if(t && !strcasecmp(t, ".gem")) ++ createDir = 1; ++ } ++ } ++ + /* if necessary, create and cd into the proper dir */ + if (createDir) { + buf = rpmExpand("%{__mkdir_p} ", spec->buildSubdir, "\n",
\ No newline at end of file diff --git a/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment.obj b/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment.obj new file mode 100644 index 000000000..e6c478a4a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/417e09d6/attachment.obj @@ -0,0 +1,80 @@ +diff -p -up rpm-4.10.0/build/parsePrep.c.2006 rpm-4.10.0/build/parsePrep.c +--- rpm-4.10.0/build/parsePrep.c.2006 2012-05-22 10:53:51.000000000 +0000 ++++ rpm-4.10.0/build/parsePrep.c 2012-06-15 09:17:31.945151263 +0000 +@@ -138,7 +138,10 @@ static char *doUntar(rpmSpec spec, uint3 + char *fn = NULL; + char *buf = NULL; + char *tar = NULL; +- const char *taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf"); ++ char taropts[8]; ++ char *t; ++ char *rubygemopts = NULL; ++ int rubygem = 0; + struct Source *sp; + rpmCompressedMagic compressed = COMPRESSED_NOT; + +@@ -158,6 +161,25 @@ static char *doUntar(rpmSpec spec, uint3 + + fn = rpmGetPath("%{_sourcedir}/", sp->source, NULL); + ++ t = strrchr(sp->source, '.'); ++ if(t && !strcasecmp(t, ".gem")) ++ rubygem = 1; ++ ++ t = stpcpy(taropts, "-x"); ++ if(rpmIsVerbose() && !quietly) ++ t = stpcpy(t, "vv"); ++ if(rubygem) ++ t = stpcpy(t, "m"); ++ t = stpcpy(t, "f"); ++ ++ if (rubygem) { ++ rasprintf(&rubygemopts, ++ "\n" ++ "if [ -f data.tar.gz ]; then\n" ++ " tar %s data.tar.gz\n" ++ "fi", taropts); ++ } ++ + /* XXX On non-build parse's, file cannot be stat'd or read */ + if (!(spec->flags & RPMSPEC_FORCE) && (rpmFileIsCompressed(fn, &compressed) || checkOwners(fn))) { + goto exit; +@@ -204,7 +226,7 @@ static char *doUntar(rpmSpec spec, uint3 + "STATUS=$?\n" + "if [ $STATUS -ne 0 ]; then\n" + " exit $STATUS\n" +- "fi", zipper, fn, tar, taropts); ++ "fi%s", zipper, fn, tar, taropts, rubygem ? rubygemopts : ""); + } else { + rasprintf(&buf, "%s '%s'\n" + "STATUS=$?\n" +@@ -214,7 +236,7 @@ static char *doUntar(rpmSpec spec, uint3 + } + free(zipper); + } else { +- rasprintf(&buf, "%s %s %s", tar, taropts, fn); ++ rasprintf(&buf, "%s %s %s%s", tar, taropts, fn, rubygem ? rubygemopts : ""); + } + + exit: +@@ -316,6 +338,20 @@ static int doSetupMacro(rpmSpec spec, co + free(buf); + } + ++ /* check if source is a ruby gem */ ++ { struct Source *sp; ++ for (sp = spec->sources; sp != NULL; sp = sp->next) { ++ if ((sp->flags & RPMBUILD_ISSOURCE) && (sp->num == 0)) { ++ break; ++ } ++ } ++ if (sp != NULL) { ++ char *t = strrchr(sp->source, '.'); ++ if(t && !strcasecmp(t, ".gem")) ++ createDir = 1; ++ } ++ } ++ + /* if necessary, create and cd into the proper dir */ + if (createDir) { + buf = rpmExpand("%{__mkdir_p} ", spec->buildSubdir, "\n",
\ No newline at end of file diff --git a/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment-0001.asc b/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment-0001.asc new file mode 100644 index 000000000..73526827a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk/bTWcACgkQqEs9DA4DquCeTgCfb5j7F9hOnqmXIMqcQwN2UsZL +UEMAnREeOXb22GAuHWKlIfTRkaRbY5Js +=BQMg +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment.asc b/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment.asc new file mode 100644 index 000000000..73526827a --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/43c98c24/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk/bTWcACgkQqEs9DA4DquCeTgCfb5j7F9hOnqmXIMqcQwN2UsZL +UEMAnREeOXb22GAuHWKlIfTRkaRbY5Js +=BQMg +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment-0001.asc b/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment-0001.asc new file mode 100644 index 000000000..45f1b0212 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk/bTdMACgkQqEs9DA4DquAFIACfVFJlgJwavox8YjgGJp3M5uNm +hxEAni/DkupOHlQgonRBqJ8R5CKkQnN7 +=OcCZ +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment.asc b/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment.asc new file mode 100644 index 000000000..45f1b0212 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20120615/cff7743e/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk/bTdMACgkQqEs9DA4DquAFIACfVFJlgJwavox8YjgGJp3M5uNm +hxEAni/DkupOHlQgonRBqJ8R5CKkQnN7 +=OcCZ +-----END PGP SIGNATURE----- |