-
Notifications
You must be signed in to change notification settings - Fork 602
[main extended] Enable libguestfs #1970
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
ee6f82f
Remove libreport support from mdadm
oliviacrain f6ac607
Conditionally pull in perl-Sys-Virt test deps
oliviacrain 7a7b367
Fix dependency resolution for ocaml-ctypes
oliviacrain 5f49edd
Upgrade to latest ocaml-gettext
oliviacrain e1fe4f8
Fix ocaml-ounit build
oliviacrain ba72d23
Upgrade ocaml-base to latest
oliviacrain 48edd08
Upgrade ocaml-migrate-parsetree to latest
oliviacrain 9f89efa
Upgrade ocaml-stdio to 0.15.0
oliviacrain 573efda
Upgrade ocaml-parsexp to 0.15.0
oliviacrain 8ef2b51
Upgrade ocaml-ppxlib to 0.24.0
oliviacrain c49e687
Upgrade ocaml-sexplib to 0.15.0
oliviacrain b008d1c
Upgrade ocaml-sexplib0 to 0.15.0
oliviacrain 4a5354c
Upgrade supermin to 5.2.1
oliviacrain b475400
Fixup libguestfs patches and configuration
oliviacrain b4eddcc
Remove gpgcheck, re-add check section in supermin
oliviacrain 4757d5f
Remove git BR from perl-Sys-Virt
oliviacrain 6663f57
Add comment on thread kill atch in ocaml-ounit
oliviacrain b6c02b9
libguestfs requested changes
oliviacrain c198cd7
Typo fix, gitignore addition, remove archive
oliviacrain d2c7907
Remove source1 in supermin
oliviacrain 52ed6c8
Remove sig from supermin json
oliviacrain 39187ff
libguestfs sigs fix
oliviacrain 46f3f22
Fix supermin json
oliviacrain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -152,7 +152,9 @@ BuildRequires: rubygem(json) | |
| BuildRequires: rubygem(rdoc) | ||
| BuildRequires: rubygem(test-unit) | ||
| BuildRequires: rubygem(irb) | ||
| %if %{with php} | ||
| BuildRequires: php-devel | ||
| %endif | ||
| BuildRequires: gobject-introspection-devel | ||
| #BuildRequires: gjs | ||
| BuildRequires: vala | ||
|
|
@@ -347,7 +349,9 @@ Language bindings: | |
| lua-guestfs Lua bindings | ||
| ocaml-libguestfs-devel OCaml bindings | ||
| perl-Sys-Guestfs Perl bindings | ||
| %if %{with php} | ||
| php-libguestfs PHP bindings | ||
| %endif | ||
| python3-libguestfs Python 3 bindings | ||
| ruby-libguestfs Ruby bindings | ||
| libguestfs-vala Vala language bindings | ||
|
|
@@ -663,7 +667,7 @@ Provides: ruby(guestfs) = %{version} | |
| %description -n ruby-%{name} | ||
| ruby-%{name} contains Ruby bindings for %{name}. | ||
|
|
||
|
|
||
| %if %{with php} | ||
| %package -n php-%{name} | ||
| Summary: PHP bindings for %{name} | ||
| Requires: %{name}%{?_isa} = %{version}-%{release} | ||
|
|
@@ -672,7 +676,7 @@ Requires: php(api) = %{php_core_api} | |
|
|
||
| %description -n php-%{name} | ||
| php-%{name} contains PHP bindings for %{name}. | ||
|
|
||
| %endif | ||
|
|
||
| %package -n lua-guestfs | ||
| Summary: Lua bindings for %{name} | ||
|
|
@@ -779,13 +783,16 @@ sed -e "s|@PWD@|$(pwd)|" %{SOURCE6} > yum.conf | |
|
|
||
|
|
||
| %build | ||
| # "--with-distro=REDHAT" is used to indicated Mariner is "Fedora-like" in package naming | ||
| %{configure} \ | ||
| PYTHON=%{__python3} \ | ||
| --with-distro=REDHAT \ | ||
This conversation was marked as resolved.
Show resolved
Hide resolved
|
||
| --with-supermin-packager-config=$(pwd)/yum.conf \ | ||
| --with-default-backend=libvirt \ | ||
| --with-qemu="qemu-system-%{_build_arch} qemu" \ | ||
| %if %{without php} | ||
| --disable-php \ | ||
| %endif | ||
| %ifnarch %{golang_arches} | ||
| --disable-golang \ | ||
| %endif | ||
|
|
@@ -1124,13 +1131,13 @@ rm ocaml/html/.gitignore | |
| %{ruby_vendorarchdir}/_guestfs.so | ||
| %{_mandir}/man3/guestfs-ruby.3* | ||
|
|
||
| # Temporarily disabled by Fedora | ||
| #%files -n php-%{name} | ||
| #%doc php/README-PHP | ||
| #%dir %{_sysconfdir}/php.d | ||
| #%{_sysconfdir}/php.d/guestfs_php.ini | ||
| #%{_libdir}/php/modules/guestfs_php.so | ||
|
|
||
| %if %{with php} | ||
| %files -n php-%{name} | ||
| %doc php/README-PHP | ||
| %dir %{_sysconfdir}/php.d | ||
| %{_sysconfdir}/php.d/guestfs_php.ini | ||
| %{_libdir}/php/modules/guestfs_php.so | ||
| %endif | ||
|
|
||
| %files -n lua-guestfs | ||
| %doc lua/examples/*.lua | ||
|
|
@@ -1181,15 +1188,13 @@ rm ocaml/html/.gitignore | |
|
|
||
|
|
||
| %changelog | ||
| * Thu Jan 20 2022 Thomas Crain <[email protected]> - 1.44.0-4 | ||
| - Patch ocaml support, RPM config support | ||
| - Disable inspect-icons support by default (we don't have ghostscript) | ||
| - Remove reiserfs, nilfs, jfs, hfsplus completely | ||
|
|
||
| * Tue Jan 18 2022 Thomas Crain <[email protected]> - 1.44.0-3 | ||
| * Thu Jan 20 2022 Thomas Crain <[email protected]> - 1.44.0-3 | ||
| - Remove Fedora-specific comments/macros | ||
| - Remove link to highjacked upstream bug tracker | ||
| - Conditionally include PHP deps (off by default) | ||
| - Patch ocaml support, RPM config support | ||
| - Disable inspect-icons support by default (we don't have ghostscript) | ||
| - Remove reiserfs, nilfs, jfs, hfsplus completely | ||
| - License verified | ||
|
|
||
| * Thu Sep 30 2021 Thomas Crain <[email protected]> - 1.44.0-2 | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.