https://bugzilla.redhat.com/show_bug.cgi?id=1670656 --- Comment #46 from Mark Goodwin <mgoodwin@xxxxxxxxxx> --- (In reply to Xavier Bachelot from comment #43) > Please add comments referencing the PRs for the patches once you have > submitted them. will do > Please file an issue upstream and reference it in the spec for the failing > test. will do > Use %global instead of %define in the following line: > %define _debugsource_template %{nil} done > There's a typo in the tmpfs conf file creation, its content is likely > invalid: > {%GRAFANA_GROUP} --> %{GRAFANA_GROUP} well spotted, thanks. fixed > A brp script is complaining: > """ > + /usr/lib/rpm/redhat/brp-mangle-shebangs > ... fixed > The unbundling of go packages should be done in %prep rather than %build. > Same for the 2 hidden files removal. done > About unbundling, the more I look at the EL7 exception, the more I find it > really ugly and likely does not conform to guidelines. > Please remove the %if's around the go BuildRequires and the vendor dir > cleaning, so they are always used. > That way, it is not necessary to add back the 100+ lines of bundled go > provides I wrote about in comment #39 and grafana can be built for EL7 once > the missing golang packages are branched and built from Fedora. ok done > I think the upstream build script should not be used and the 2 binaries > should be built using the %gobuild macro. > After a bit of trial and error, something like that and a BR: > compiler(go-compiler) works. > %gobuild -o grafana-cli ./pkg/cmd/grafana-cli > %gobuild -o grafana-server ./pkg/cmd/grafana-server ok done (that %gobuild generates a LOT of messages) > This should allow to get rid of the arch symlinks at top of %install. yep, now no longer needed > Maybe that would also remove the need for %global _debugsource_template > %{nil} ? correct. And now we have a debugsource package too > The %gobuild macro doesn't help with _debugsource_template. it's working now, so maybe something in rawhide has been updated to fix that > There are %gotest and %gochecks macros that shall be used in %check. > https://fedoraproject.org/wiki/More_Go_packaging#.25check:_.25gochecks_and_.25.7Bgotest.7D now using %gochecks > Also, given the fair amount of likely Fedora/RHEL specific macros that are now in the spec, > I'm wondering if the > conditional around grafana.ini and defaults.ini installation > makes sense anymore ? I guess adding openSuSE and Mageia to your copr repo will find out. > the intent is for a more generic default ini, i.e. suitable for distros, as opposed to being grafana.com specific for things like checking for updates, usage stats being sent to grafana.com, etc. See diff conf/defaults.ini conf/distro-defaults.ini Have also updated to latest upstream sources, grafana-6.1.4 thanks Spec URL: https://mgoodwin.fedorapeople.org/grafana/grafana.spec SRPM URL: https://mgoodwin.fedorapeople.org/grafana/grafana-6.1.4-1.fc31.src.rpm koji rawhide build: https://koji.fedoraproject.org/koji/taskinfo?taskID=34378287 -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component _______________________________________________ package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/package-review@xxxxxxxxxxxxxxxxxxxxxxx
