[opensuse-buildservice] Linked spec files not updating after file is patched?
Hi, I'm having some problems with custom builds that require spec file changes. While the changes themselves work, it seems to cause OBS to stop tracking the upstream changes. I don't know whether this is a bug, expected behaviour, or something that I've done wrong. I've branched Gnome Books from GNOME:Factory [1]. I'm fairly sure I didn't tick the "stay on this revision" box. I've added some diffs for custom patches and put a "<topadd>" tag in my _link [2] to add the patches without having to make an actual .diff file for the .spec. Gnome 3.32 has been released* and the upstream spec file is showing v3.32 [3]. Meanwhile, my spec file is still showing 3.30.1 [4]. However, I *do* see the 3.32 tarball in my (merged) sources, as well as the old 3.30 one [5]. Is there a way to fix this so that my packages modify the .spec to add patches but also track the upstream changes? I'm happy to fix breakages if the spec file changes a lot upstream (as that's basically what I'd have to do with a diff file if upstream changed a lot). Thanks, IBBoard * Yes, I know this breaks my example package, because Gnome Books has been separated, but I think that's separate from the underlying spec change issue [1] https://build.opensuse.org/package/show/home:IBBoard:desktop/gnome-documents [2] https://build.opensuse.org/package/view_file/home:IBBoard:desktop/gnome-docu... [3] https://build.opensuse.org/package/view_file/GNOME:Factory/gnome-documents/g... [4] https://build.opensuse.org/package/view_file/home:IBBoard:desktop/gnome-docu... [5] https://build.opensuse.org/package/show/home:IBBoard:desktop/gnome-documents... -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Apr 19 2019, IBBoard
Is there a way to fix this so that my packages modify the .spec to add patches but also track the upstream changes?
Remove the local files that override the files in the linked package. By removing <branch/> you converted the branch back into a link, and local files are no longer merged. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 19/04/2019 20:22, Andreas Schwab wrote:
On Apr 19 2019, IBBoard
wrote: Is there a way to fix this so that my packages modify the .spec to add patches but also track the upstream changes?
Remove the local files that override the files in the linked package. By removing <branch/> you converted the branch back into a link, and local files are no longer merged.
Andreas.
Ah, so patching the spec file creates a local spec file, which then won't get merged? I'd assumed that things like <topadd> would be idempotent mutation commands that it could keep re-running as things changed. Is there no way around that? Surely my use case isn't that odd! I think I'm using <topadd> because spec files have started using "%autosetup" and that duplicates the behaviour of the "%patch#" lines that conventional <add> tags in the _link file added (so patching ends up failing because it tries re-applying an already applied patch). -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Apr 20 2019, IBBoard
Ah, so patching the spec file creates a local spec file,
No, your problem is that you added the file in the first place. Just remove it. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 20/04/2019 21:46, Andreas Schwab wrote:
On Apr 20 2019, IBBoard
wrote: Ah, so patching the spec file creates a local spec file,
No, your problem is that you added the file in the first place. Just remove it.
Andreas.
Odd. I didn't knowingly add copies of the files to my project. And I definitely didn't intentionally create copies of the tarball (which were also showing up in "unmerged" view). I'll look in to it and see what I can fix, and whether I can find something that triggered it (or whether it happens again in future). Thanks. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Apr 21 2019, IBBoard
Odd. I didn't knowingly add copies of the files to my project.
Yes, you did, by creating a branch. If you had started with a plain link, you wouldn't be in that situation. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 21/04/2019 14:03, Andreas Schwab wrote:
On Apr 21 2019, IBBoard
wrote: Odd. I didn't knowingly add copies of the files to my project.
Yes, you did, by creating a branch. If you had started with a plain link, you wouldn't be in that situation.
Andreas.
Ah, okay. I think I'm starting to understand the details. I've just been using OBS online (rather than command-line) because I'm only adding little patches to tweak and fix little things. As there's a "branch" function that has a tickbox to say "stay on current revision" then the implication is that not doing ticking that does a "soft" branch that tracks the changes in the upstream package. Obviously I've misunderstood how it works all this time. I've stripped all of my packages back and hopefully it'll all work as I expect now. Thanks. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (2)
-
Andreas Schwab
-
IBBoard