<div dir="ltr"><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Dec 21, 2020 at 9:04 PM James Cameron <<a href="mailto:quozl@laptop.org">quozl@laptop.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">I don't believe it, because telepathy-salut-0.8.1.tar.gz does contain<br> lib/ext/wocky, and it is a directory which contains files. There's no<br> reason why a git submodule should affect the tar.gz in that way.<br></blockquote><div><br></div><div>telepathy-salut-0.8.1.tar.gz does contain lib/ext/wocky as a directory with files in it</div><div>and it has the <a href="https://github.com/TelepathyIM/telepathy-salut">github repo</a> as it's upstream and that doesn't contain lib/ext/wocky as a directory but as <br></div><div>a wocky submodule. I don't see a reason why the git submodule is affecting it at the moment<br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br> It seems more likely the patch is in error. How can I see the patch?<br> <a href="https://src.fedoraproject.org/" rel="noreferrer" target="_blank">https://src.fedoraproject.org/</a> didn't seem to have it.<br></blockquote><div><br></div><div>Yeah I haven't created an PRs as I'm trying to get it to build locally first, you can find the patch <a href="https://paste.centos.org/view/191e4487">here</a>. </div><div><br></div><div>The commit upstream shows that there was a change but the change was to a submodule, <br></div><div>the source files from <a href="http://telepathyfreedesktop.org">telepathyfreedesktop.org</a> contains lib/ext/wocky but the source on github doesn't and <br></div><div>that explains the error from build.log</div><div><br></div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br> You may place temporary shell commands for diagnosis in the %prep<br> section before the %patch1. Such as ls(1) or file(1). This will give<br> you output in the build log that you can use to diagnose further.<br></blockquote><div><br></div><div>I used rpmbuild to build just the %prep section and ls shows there files in lib/ext/wocky</div><div>but still throws same error when applying the patch and I don't get why right now but I think it's because <br></div><div>the patch is pointing to a submodule commit.</div><br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <br> You should also consider building by hand using rpmbuild, as that will<br> speed up your iterations for solving the problem. Once you have it<br> solved, go back to using the Fedora infrastructure to build.<br> <br> On Mon, Dec 21, 2020 at 04:50:39PM +0100, Chihurumnaya Ibiam wrote:<br> > This isn't a problem on my path as I'm not trying to build telepathy-salut from<br> > the source code so I didn't clone telepathy-salut,<br> > building telepathy-salut locally and on koji doesn't work because of what I<br> > stated above, I should've included the error<br> > I got from the build log earlier;<br> > <br> > Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):<br> > + echo 'Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):'<br> > + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0<br> > File lib/ext/wocky is not a regular file -- refusing to patch<br> > <br> > You can find the full build log [1]here.<br> > <br> > The error seems to happen because in the source code, [2]lib/ext/wocky is pointing to a particular commit in the wocky submodule,<br> > <br> > hence the patch failing as that's not a regular file.<br> > <br> > --<br> > <br> > Ibiam Chihurumnaya<br> > [3]<a href="mailto:ibiamchihurumnaya@gmail.com" target="_blank">ibiamchihurumnaya@gmail.com</a><br> > <br> > On Sat, Dec 19, 2020 at 12:43 AM James Cameron <[4]<a href="mailto:quozl@laptop.org" target="_blank">quozl@laptop.org</a>> wrote:<br> > <br> > On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote:<br> > > Hi Everyone,<br> > ><br> > > I'm currently working on fixing telepathy-salut to use openssl 1.0<br> > > which has been fixed upstream in this [1]commit but the problem is,<br> > > lib/ext/wocky points to a particular commit in the wocky submodule<br> > > of TelepathyIM hence the patch fails as it isn't a regular file,<br> > > it's supposed to be a directory but in this case it's empty as it's<br> > > pointing to a particular commit.<br> > <br> > When the wocky directory is empty, that suggests the submodule has not<br> > been checked out.<br> > <br> > > What are the possible ways to fix this?<br> > <br> > When cloning, use --recurse-submodules. Or, use `git submodule update<br> > --init --recursive` after cloning.<br> > <br> > Should you be preparing a patch for packaging, you can also work<br> > around such git problems by using a recursive diff between two clones<br> > of wocky. You may need to tweak the diffs with sed.<br> > <br> > --<br> > James Cameron<br> > [5]<a href="http://quozl.netrek.org/" rel="noreferrer" target="_blank">http://quozl.netrek.org/</a><br> > <br> > References:<br> > <br> > [1] <a href="https://kojipkgs.fedoraproject.org//work/tasks/1714/57311714/build.log" rel="noreferrer" target="_blank">https://kojipkgs.fedoraproject.org//work/tasks/1714/57311714/build.log</a><br> > [2] <a href="https://github.com/TelepathyIM/wocky/tree/64062d2f0119b89d15e7bb0e0f6fa54ec23ff7f8" rel="noreferrer" target="_blank">https://github.com/TelepathyIM/wocky/tree/64062d2f0119b89d15e7bb0e0f6fa54ec23ff7f8</a><br> > [3] mailto:<a href="mailto:ibiamchihurumnaya@gmail.com" target="_blank">ibiamchihurumnaya@gmail.com</a><br> > [4] mailto:<a href="mailto:quozl@laptop.org" target="_blank">quozl@laptop.org</a><br> > [5] <a href="http://quozl.netrek.org/" rel="noreferrer" target="_blank">http://quozl.netrek.org/</a><br> <br> -- <br> James Cameron<br> <a href="https://quozl.linux.org.au/" rel="noreferrer" target="_blank">https://quozl.linux.org.au/</a></blockquote><div><br></div><div><br></div><div><br></div><div><div><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><pre style="color:rgb(46,52,54);letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;word-spacing:0px"><span style="font-family:monospace,monospace">-- <br></span></pre><div style="color:rgb(46,52,54);font-size:14.6667px;font-style:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;word-spacing:0px;width:71ch"><span style="font-family:monospace,monospace"><span></span><span></span>Ibiam Chihurumnaya <br></span></div><div style="color:rgb(46,52,54);font-size:14.6667px;font-style:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;word-spacing:0px;width:71ch"><span style="font-family:monospace,monospace"><a href="mailto:ibiamchihurumnaya@gmail.com" style="color:rgb(42,118,198)" target="_blank">ibiamchihurumnaya@gmail.com</a></span></div><div style="color:rgb(46,52,54);font-size:14.6667px;font-style:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;word-spacing:0px;width:71ch"><span style="font-family:monospace,monospace"><br><br></span></div></div></div></div></div></div> </div></div></div>