scripts/rpmbuild: refactor specfile for Fedora #3809
Conversation
|
关联 #3808 |
Association #3808 |
%autochangelog isn't available in openSUSE (provided by rpmautospec)
|
Test builds up at https://copr.fedorainfracloud.org/coprs/mochaa/xmake/. Seems all good. |
|
cc @waruqi 請求 review ;) |
cc @waruqi claim review ;) |
| # add deps | ||
| if has_config "external"; then | ||
| + add_deps "sv" | ||
| + add_deps "tbox" |
There was a problem hiding this comment.
我查了一圈大部分 RPM 发行版没带这两个包，这里的 patch 只是把这两个依赖改成静态了，同样只影响 rpmbuild，就没这个必要去多维护两个包了吧。
There was a problem hiding this comment.
既然 rpm 发行版没硬性要求走外部依赖。。那就没必要走 external，全默认用内置依赖编译就好了，这里也就不用改，原本 xmake 的库依赖没几个，都非常小，全走内置，编译安装还更稳定，也不会因为 lua 找错版本，编译跪。。。
external 主要是因为，debian 强制要求只能走外部依赖，没办法，才搞得。。
There was a problem hiding this comment.
Fedora 这边也是强制的。看 Packaging Guidelines
There was a problem hiding this comment.
那两个豁免是因为体量和 stb header 差不多，就直接作为 static 就行，也不用担心更新问题
There was a problem hiding this comment.
@waruqi It seemed that the libsv and tbox both have been packaged in Debian repository. Maybe we can do the same in Fedora.
@mochaaP It seemed that you have an Fedora account ? Btw, may I ask that do you have any interest of becoming the Fedora packager? see: https://docs.fedoraproject.org/en-US/package-maintainers/Joining_the_Package_Maintainers/
So you and I can make these packages (libsv, tbox and xmake) available in the Fedora repository.
Ref: https://packages.debian.org/sid/source/libsv
https://packages.debian.org/sid/source/tbox
There was a problem hiding this comment.
@topazus
Yup, that's me.
If you could mentor me (as in the Fedora terms, "sponsor"), I'd be very glad to!
My introduction post was on the devel mailing list months ago, feel free to check it.
There was a problem hiding this comment.
@mochaaP I only became a Fedora packager a few months ago, and am not a Fedora sponsor. So I cannot sponsor and mentor you into the packager group. You could create the package review on redhat bugzilla first, and then find a Fedora sponsor (maybe directly by Email) to let he/she start your first package review and sponsored you into the packager group. For me, Vasiliy Glazov, [email protected] reviewed my first package review and sponsored me. You can also contact other persons, like Vitaly Zaitsev, [email protected] .
Ref: https://docs.fedoraproject.org/en-US/package-maintainers/How_to_Get_Sponsored_into_the_Packager_Group/#how_to_find_a_sponsor
https://lists.fedoraproject.org/archives/list/[email protected]/thread/CWHKVAWESDO3B6FE3BR6GXSXFT2TZTXG/
There was a problem hiding this comment.
@mochaaP Or you can just put a post with the package review URL of RHBZ on Fedora devel list, and say that you need a sponsor to review you package. Then someone will take your package review and mentor you.
There was a problem hiding this comment.
I'm working on libtbox now.
Blocking: tboox/tbox#214
|
有一些 build failed 了 。。https://copr.fedorainfracloud.org/coprs/waruqi/xmake/build/6002677/ |
我看過了，都是已經 eol 的發行版，引導用戶去用 static build 吧。 我開的構建有這些，你可以參考一下： |
怎么引导？还是得调整下构建的发行版列表？ |
|
改了之后，好多了 https://copr.fedorainfracloud.org/coprs/waruqi/xmake/build/6002723/
不过这两不行 |
How to guide? Or do I have to tweak the build distribution list? |
|
@waruqi 大概是竟态了，按下rebuild就行 |
@waruqi It's probably a race, just press rebuild |
|
呃 我又看了一下 不过还好这个发行版用的人并不多，先禁用吧 |
uh i looked again Fortunately, there are not many people using this distribution, so disable it first. |
|
我禁了 |
I banned |
diff --git a/scripts/rpmbuild/xmake.spec b/scripts/rpmbuild/xmake.spec
index dd4f3b1af..b184b948c 100644
--- a/scripts/rpmbuild/xmake.spec
+++ b/scripts/rpmbuild/xmake.spec
@@ -2,7 +2,7 @@
%define use_luajit 0
Name: xmake
-Version: 2.7.9
+Version: 2.8.1
Release: 1%{?dist}
Summary: A cross-platform build utility based on Lua
@@ -53,11 +53,7 @@ rm -rf core/src/{lua,luajit,lua-cjson,lz4,pdcurses}/*/
%build
%set_build_flags
-./configure --external=yes \
- --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --libdir=%{_libdir} \
- --includedir=%{_includedir} \
+%configure --external=yes \
%if %{use_luajit}
--runtime=luajit
%else
@@ -100,6 +96,9 @@ cp -rp xmake \
%{_mandir}/man1/*.1*
%changelog
+* Tue Jul 11 2023 Zephyr Lykos <[email protected]> - 2.8.1-1
+- Update to 2.8.1
+
* Sun Jun 04 2023 Zephyr Lykos <[email protected]> - 2.7.9-1
- Switch to release tarball
- Use system provided libs if possible |
|
? 是要更新这个 patch ？ 你可以直接提 pr 过来 |
? Do you want to update this patch? You can directly submit the pr |
key 不在手边，直接发 patch 了 |
The key is not at hand, and the patch is sent directly |
|
改了，你可以直接 github 上 edit 编辑的 |
Changed, you can edit directly on github |
修复了一些问题：
DRAFT: 未测试 openSUSE, RHEL, Rocky Linux, openEular 等发行版的兼容性，请在用相应发行版的同学贡献和测试一下~