Skip to content
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 Jan 21, 2022
f6ac607
Conditionally pull in perl-Sys-Virt test deps
oliviacrain Jan 21, 2022
7a7b367
Fix dependency resolution for ocaml-ctypes
oliviacrain Jan 21, 2022
5f49edd
Upgrade to latest ocaml-gettext
oliviacrain Jan 21, 2022
e1fe4f8
Fix ocaml-ounit build
oliviacrain Jan 21, 2022
ba72d23
Upgrade ocaml-base to latest
oliviacrain Jan 21, 2022
48edd08
Upgrade ocaml-migrate-parsetree to latest
oliviacrain Jan 21, 2022
9f89efa
Upgrade ocaml-stdio to 0.15.0
oliviacrain Jan 21, 2022
573efda
Upgrade ocaml-parsexp to 0.15.0
oliviacrain Jan 21, 2022
8ef2b51
Upgrade ocaml-ppxlib to 0.24.0
oliviacrain Jan 21, 2022
c49e687
Upgrade ocaml-sexplib to 0.15.0
oliviacrain Jan 21, 2022
b008d1c
Upgrade ocaml-sexplib0 to 0.15.0
oliviacrain Jan 21, 2022
4a5354c
Upgrade supermin to 5.2.1
oliviacrain Jan 21, 2022
b475400
Fixup libguestfs patches and configuration
oliviacrain Jan 21, 2022
b4eddcc
Remove gpgcheck, re-add check section in supermin
oliviacrain Jan 21, 2022
4757d5f
Remove git BR from perl-Sys-Virt
oliviacrain Jan 21, 2022
6663f57
Add comment on thread kill atch in ocaml-ounit
oliviacrain Jan 21, 2022
b6c02b9
libguestfs requested changes
oliviacrain Jan 21, 2022
c198cd7
Typo fix, gitignore addition, remove archive
oliviacrain Jan 21, 2022
d2c7907
Remove source1 in supermin
oliviacrain Jan 21, 2022
52ed6c8
Remove sig from supermin json
oliviacrain Jan 21, 2022
39187ff
libguestfs sigs fix
oliviacrain Jan 21, 2022
46f3f22
Fix supermin json
oliviacrain Jan 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions SPECS-EXTENDED/libguestfs/libguestfs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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 \
--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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down