modularity / fedmod

#112 Fix fedmod breakages when building Flatpaks and update it to Fedora 36
Merged by kalev. Opened by tpopela.
modularity/ tpopela/fedmod flatpak-fixes  into  master

Download 112.patch

I'm putting here all the required changes that one needs to apply locally to have a working environment for building the Fedora Flatpaks. As I have doubts whether the changes will be merged and the fedmod in Fedora is orphaned anyway I suggest patching the sources locally for those who wants to work on Flatpaks.

@sbergmann @xberry @harrymichal @otaylor - FYI

I've made a scratch build with these changes and uploaded it to https://tpopela.fedorapeople.org/fedmod/ . I had to disable the build of shell completion because it's a cause of FTBFS (and hence the reason why it was removed from Fedora 36+). If anyone can fix that, it would be nice. Here is the diff of the SPEC file:

diff --git a/fedmod.spec b/fedmod.spec
index 68368aa..f8aa4e1 100644
--- a/fedmod.spec
+++ b/fedmod.spec
@@ -2,13 +2,19 @@
 Name:           fedmod
 Version:        0.6.4
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Utilities for generating & maintaining modulemd files
 License:        GPLv2+ and GPLv3+ and MIT
 URL:            https://pagure.io/modularity/fedmod
 Source0:        %{name}-%{version}.tar.gz
+# https://pagure.io/modularity/fedmod/pull-request/112
+Patch0:         0001-Change-the-URL-for-source-packages-in-updates.patch
+Patch1:         0002-Update-to-F36.patch
+Patch2:         0003-Don-t-panic-on-rich-dependencies.patch
+Patch3:         0004-Dependency-resolution-fails-on-packages-with-dot-in-.patch
+
 BuildArch:      noarch
 BuildRequires:  python3-aiohttp
@@ -65,20 +71,20 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/fedmod
 install -m 644 config/*.yaml %{buildroot}%{_sysconfdir}/fedmod/
 # shell completion
-for shell_path in \
-        bash:%{_datadir}/bash-completion/completions/fedmod \
-        zsh:%{_datadir}/zsh/vendor-completions/_fedmod \
-        fish:%{_datadir}/fish/vendor_completions.d/fedmod.fish; do
-    shell="${shell_path%%:*}"
-    path="${shell_path#*:}"
-    dir="${path%/*}"
-
-    install -d "%{buildroot}${dir}"
-
-    _FEDMOD_COMPLETE=source-"$shell" %{__python3} \
-        -c "import sys; sys.argv[0] = 'fedmod'; from _fedmod import cli; cli.run()" \
-        > "%{buildroot}${path}"
-done
+# for shell_path in \
+#        bash:%{_datadir}/bash-completion/completions/fedmod \
+#        zsh:%{_datadir}/zsh/vendor-completions/_fedmod \
+#        fish:%{_datadir}/fish/vendor_completions.d/fedmod.fish; do
+#    shell="${shell_path%%:*}"
+#    path="${shell_path#*:}"
+#    dir="${path%/*}"
+#
+#    install -d "%{buildroot}${dir}"
+#
+#    _FEDMOD_COMPLETE=source-"$shell" %{__python3} \
+#        -c "import sys; sys.argv[0] = 'fedmod'; from _fedmod import cli; cli.run()" \
+#        > "%{buildroot}${path}"
+#done
 %check
 if ! %{__python3} -m pytest -v -m "not needs_metadata"; then
@@ -99,17 +105,21 @@ fi
 %config(noreplace) %{_sysconfdir}/fedmod/*.yaml
 %{python3_sitelib}/_fedmod
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/fedmod
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/vendor-completions
-%{_datadir}/zsh/vendor-completions/_fedmod
-%dir %{_datadir}/fish
-%dir %{_datadir}/fish/vendor_completions.d
-%{_datadir}/fish/vendor_completions.d/fedmod.fish
+#%dir %{_datadir}/bash-completion
+#%dir %{_datadir}/bash-completion/completions
+#%{_datadir}/bash-completion/completions/fedmod
+#%dir %{_datadir}/zsh
+#%dir %{_datadir}/zsh/vendor-completions
+#%{_datadir}/zsh/vendor-completions/_fedmod
+#%dir %{_datadir}/fish
+#%dir %{_datadir}/fish/vendor_completions.d
+#%{_datadir}/fish/vendor_completions.d/fedmod.fish
 %changelog
+* Mon Jun 13 2022 Tomas Popela <tpopela@redhat.com> - 0.6.4-3.1
+- Backport fixes from https://pagure.io/modularity/fedmod/pull-request/112
+  and disable the shell completion because it's the cause of FTBFS
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

All of these changes look good to me. Thanks, Tomas!

Pull-Request has been merged by kalev
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.