GNOME Bugzilla – Bug 738507
[PATCH] Fedora 19 build broken (and more)
Last modified: 2014-10-20 10:40:51 UTC
2fb6b6b contrib/rpm: Do not count only the first parent a9f45e0 contrib/rpm: Fix Fedora 19 build 860dd38 contrib/rpm: Don't exclude files that are not built 0ac6848 build: Don't leak generated files into distribution The first one fixes descending version number with octopus merges (I'm doing those for my integration testing), the rest fix build of Fedora 19 package. The last one is not specific to Fedora 19, it affects RHEL 7 when distribution is built on newer host too. Branch: https://github.com/lkundrak/NetworkManager/commits/lr-rpm-build
Created attachment 288439 [details] [PATCH 1/4] build: Don't leak generated files into distribution
Created attachment 288440 [details] [PATCH 2/4] contrib/rpm: Don't exclude files that are not built
Created attachment 288441 [details] [PATCH 3/4] contrib/rpm: Fix Fedora 19 build
Created attachment 288442 [details] [PATCH 4/4] contrib/rpm: Do not count only the first parent
maybe reword the commit message for "contrib/rpm: Do not count only the first parent"? I think, the generated number is important, so that newer packages have a higher version number then older (and you can `yum install/downgrade` them as expected). I agree, the change returns a more meaningful, incrementing(!) number. LGTM
Created attachment 288541 [details] [PATCH 4/4] contrib/rpm: Count all predecessors in revision number
(In reply to comment #6) > Created an attachment (id=288541) [details] > [PATCH 4 [details]/4] contrib/rpm: Count all predecessors in revision number I meant the "After an octopus merge" part and "reference pointed to previously". We did no octopus merges up to now, only two parent merges. And I don't really understand the second part of the sentence... anyway, minor complaints. I am fine with the 4 patches.
merged as: http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=d60f593b3eb04aaaa4f295bad182aa3e08dd6e78