Attachment 2011019 Details for Bug 2260492 – The .spec file difference from Copr build 6963272 to 6967304

[patch] The .spec file difference from Copr build 6963272 to 6967304

spec-from-6963272-to-6967304.diff (text/plain), 10.42 KB, created by Fedora Review Service on 2024-01-27 19:22:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2024-01-27 19:22:46 UTC

Size: 10.42 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/6963272
>+++ https://copr.fedorainfracloud.org/coprs/build/6967304
>@@ -1,4 +1,10 @@
>-%bcond_without  check
>+# Disable documentation due to missing dependencies
>+%bcond doc 0
>+# Disable lxd migration tools, we never had lxd in Fedora
>+%bcond lxd_migrator 0
>+
>+# Enable tests
>+%bcond check 1
> 
> # https://github.com/lxc/incus
> %global goipath github.com/lxc/incus
>@@ -101,6 +107,51 @@
> 
> %godevelpkg
> 
>+%pre
>+%sysusers_create_package %{name} %{SOURCE106}
>+%tmpfiles_create_package %{name} %{SOURCE107}
>+
>+%post
>+%systemd_post %{name}.socket
>+%systemd_post %{name}.service
>+%systemd_post %{name}-startup.service
>+%systemd_post %{name}-user.socket
>+%systemd_post %{name}-user.service
>+
>+%preun
>+%systemd_preun %{name}.socket
>+%systemd_preun %{name}.service
>+%systemd_preun %{name}-startup.service
>+%systemd_preun %{name}-user.socket
>+%systemd_preun %{name}-user.service
>+
>+%postun
>+%systemd_postun_with_restart %{name}.socket
>+%systemd_postun_with_restart %{name}.service
>+%systemd_postun_with_restart %{name}-user.socket
>+%systemd_postun_with_restart %{name}-user.service
>+
>+%files
>+%license %{golicenses}
>+%config(noreplace) %{_sysconfdir}/dnsmasq.d/%{name}.conf
>+%{_sysctldir}/10-incus-inotify.conf
>+%{_unitdir}/%{name}.socket
>+%{_unitdir}/%{name}.service
>+%{_unitdir}/%{name}-startup.service
>+%{_unitdir}/%{name}-user.socket
>+%{_unitdir}/%{name}-user.service
>+%dir %{incuslibdir}
>+%{incuslibdir}/*
>+%{_sysusersdir}/%{name}.conf
>+%{_tmpfilesdir}/%{name}.conf
>+%{_mandir}/man1/incusd*.1.*
>+%attr(700,root,root) %dir %{_localstatedir}/cache/%{name}
>+%attr(700,root,root) %dir %{_localstatedir}/log/%{name}
>+%attr(711,root,root) %dir %{_localstatedir}/lib/%{name}
>+%gopkgfiles
>+
>+%dnl ----------------------------------------------------------------------------
>+
> %package selinux
> Summary:        Container hypervisor based on LXC - SELinux policy
> BuildArch:      noarch
>@@ -116,6 +167,28 @@
> 
> This package contains the SELinux policy.
> 
>+%pre selinux
>+%selinux_relabel_pre -s %{selinuxtype}
>+
>+%post selinux
>+%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
>+%selinux_relabel_post -s %{selinuxtype}
>+
>+%postun selinux
>+if [ $1 -eq 0 ]; then
>+    %selinux_modules_uninstall -s %{selinuxtype} %{name}
>+    %selinux_relabel_post -s %{selinuxtype}
>+fi
>+
>+%posttrans selinux
>+%selinux_relabel_post -s %{selinuxtype}
>+
>+%files selinux
>+%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
>+%ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
>+
>+%dnl ----------------------------------------------------------------------------
>+
> %package client
> Summary:        Container hypervisor based on LXC - Client
> License:        Apache-2.0
>@@ -128,6 +201,23 @@
> 
> This package contains the command line client.
> 
>+%files client -f incus.lang
>+%license %{golicenses}
>+%{_bindir}/%{name}
>+%dir %{bashcompletiondir}
>+%{bashcompletiondir}/%{name}
>+%{_mandir}/man1/%{name}*.1.*
>+%exclude %{_mandir}/man1/incusd*.1.*
>+%exclude %{_mandir}/man1/incus-agent.1.*
>+%exclude %{_mandir}/man1/incus-benchmark.1.*
>+%exclude %{_mandir}/man1/incus-migrate.1.*
>+%exclude %{_mandir}/man1/lxc-to-incus.1.*
>+%if %{with lxd_migrator}
>+%exclude %{_mandir}/man1/lxd-to-incus.1.*
>+%endif
>+
>+%dnl ----------------------------------------------------------------------------
>+
> %package tools
> Summary:        Container hypervisor based on LXC - Extra Tools
> License:        Apache-2.0
>@@ -143,9 +233,26 @@
> This package contains extra tools provided with Incus.
>  - fuidshift - A tool to map/unmap filesystem uids/gids
>  - lxc-to-incus - A tool to migrate LXC containers to Incus
>- - lxd-to-incus - A tool to migrate an existing LXD environment to Incus
>  - incus-benchmark - A Incus benchmark utility
>  - incus-migrate - A physical to container migration tool
>+%{?with_lxd_migrator: - lxd-to-incus - A tool to migrate an existing LXD environment to Incus}
>+
>+%files tools
>+%license %{golicenses}
>+%{_bindir}/fuidshift
>+%{_bindir}/incus-benchmark
>+%{_bindir}/incus-migrate
>+%{_bindir}/lxc-to-incus
>+%if %{with lxd_migrator}
>+%{_bindir}/lxd-to-incus
>+%{_mandir}/man1/lxd-to-incus.1.*
>+%endif
>+%{_mandir}/man1/fuidshift.1.*
>+%{_mandir}/man1/incus-benchmark.1.*
>+%{_mandir}/man1/incus-migrate.1.*
>+%{_mandir}/man1/lxc-to-incus.1.*
>+
>+%dnl ----------------------------------------------------------------------------
> 
> %package agent
> Summary:        Incus guest agent
>@@ -168,6 +275,14 @@
> It has to be installed on the Incus host if you want to allow agent
> injection capability when creating a virtual machine.
> 
>+%files agent
>+%license %{golicenses}
>+%{_bindir}/incus-agent
>+%{_mandir}/man1/incus-agent.1.*
>+
>+%dnl ----------------------------------------------------------------------------
>+
>+%if %{with doc}
> %package doc
> Summary:        Container hypervisor based on LXC - Documentation
> # This project is Apache-2.0. Other files bundled with the documentation have the
>@@ -212,6 +327,13 @@
> 
> This package contains user documentation.
> 
>+%files doc
>+%license %{golicenses}
>+%doc doc/html
>+%endif
>+
>+%dnl ----------------------------------------------------------------------------
>+
> %prep
> %goprep -k
> %autopatch -v -p1
>@@ -230,11 +352,14 @@
> BUILDTAGS="agent netgo" %gobuild -o %{gobuilddir}/bin/incus-agent %{goipath}/cmd/incus-agent
> unset CGO_ENABLED
> 
>+%if %{with lxd_migrator}
> pushd cmd/lxd-to-incus
> ln -s vendor src
> GOPATH=${GOPATH}$(pwd) %gobuild -o %{gobuilddir}/bin/lxd-to-incus ./
> popd
>-
>+%endif
>+
>+%if %{with docs}
> # build documentation
> mkdir -p doc/.sphinx/_static/swagger-ui
> cp %{SOURCE201} %{SOURCE202} %{SOURCE203} doc/.sphinx/_static/swagger-ui
>@@ -243,6 +368,7 @@
> rm -vrf doc/html/{.buildinfo,.doctrees}
> # remove duplicate files
> rm -vrf doc/html/{_sources,_sphinx_design_static}
>+%endif
> 
> # build translations
> rm -f po/zh_Hans.po po/zh_Hant.po    # remove invalid locales
>@@ -256,8 +382,10 @@
> help2man %{gobuilddir}/bin/incus-benchmark -n "The container lightervisor - benchmark" --no-info --no-discard-stderr > %{gobuilddir}/man/incus-benchmark.1
> help2man %{gobuilddir}/bin/incus-migrate -n "Physical to container migration tool" --no-info --no-discard-stderr > %{gobuilddir}/man/incus-migrate.1
> help2man %{gobuilddir}/bin/lxc-to-incus -n "Convert LXC containers to Incus" --no-info --no-discard-stderr > %{gobuilddir}/man/lxc-to-incus.1
>+help2man %{gobuilddir}/bin/incus-agent -n "Incus virtual machine guest agent" --no-info --no-discard-stderr > %{gobuilddir}/man/incus-agent.1
>+%if %{with lxd_migrator}
> help2man %{gobuilddir}/bin/lxd-to-incus -n "LXD to Incus migration tool" --no-info --no-discard-stderr > %{gobuilddir}/man/lxd-to-incus.1
>-help2man %{gobuilddir}/bin/incus-agent -n "Incus virtual machine guest agent" --no-info --no-discard-stderr > %{gobuilddir}/man/incus-agent.1
>+%endif
> 
> # SELinux policy
> mkdir selinux
>@@ -288,7 +416,7 @@
> 
> # extra configs
> install -D -m0644 -vp %{SOURCE108} %{buildroot}%{_sysconfdir}/dnsmasq.d/%{name}.conf
>-install -D -m0644 -vp %{SOURCE109} %{buildroot}%{_sysconfdir}/sysctl.d/10-incus-inotify.conf
>+install -D -m0644 -vp %{SOURCE109} %{buildroot}%{_sysctldir}/10-incus-inotify.conf
> 
> # selinux policy
> install -D -m0644 -vp selinux/%{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
>@@ -328,108 +456,12 @@
>     -d %{goipath}/cmd/lxc-to-incus  # lxc-to-incus test fails, see ganto/copr-lxc4#23
> %endif
> 
>-%pre
>-%sysusers_create_package %{name} %{SOURCE106}
>-%tmpfiles_create_package %{name} %{SOURCE107}
>-
>-%pre selinux
>-%selinux_relabel_pre -s %{selinuxtype}
>-
>-%post
>-%sysctl_apply 10-incus-inotify.conf
>-%systemd_post %{name}.socket
>-%systemd_post %{name}.service
>-%systemd_post %{name}-startup.service
>-%systemd_post %{name}-user.socket
>-%systemd_post %{name}-user.service
>-
>-%post selinux
>-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
>-%selinux_relabel_post -s %{selinuxtype}
>-
>-%preun
>-%systemd_preun %{name}.socket
>-%systemd_preun %{name}.service
>-%systemd_preun %{name}-startup.service
>-%systemd_preun %{name}-user.socket
>-%systemd_preun %{name}-user.service
>-
>-%postun
>-%systemd_postun_with_restart %{name}.socket
>-%systemd_postun_with_restart %{name}.service
>-%systemd_postun_with_restart %{name}-user.socket
>-%systemd_postun_with_restart %{name}-user.service
>-
>-%postun selinux
>-if [ $1 -eq 0 ]; then
>-    %selinux_modules_uninstall -s %{selinuxtype} %{name}
>-    %selinux_relabel_post -s %{selinuxtype}
>-fi
>-
>-%posttrans selinux
>-%selinux_relabel_post -s %{selinuxtype}
>-
>-%files
>-%license %{golicenses}
>-%config(noreplace) %{_sysconfdir}/dnsmasq.d/%{name}.conf
>-%config(noreplace) %{_sysconfdir}/sysctl.d/10-incus-inotify.conf
>-%{_unitdir}/%{name}.socket
>-%{_unitdir}/%{name}.service
>-%{_unitdir}/%{name}-startup.service
>-%{_unitdir}/%{name}-user.socket
>-%{_unitdir}/%{name}-user.service
>-%dir %{incuslibdir}
>-%{incuslibdir}/*
>-%{_sysusersdir}/%{name}.conf
>-%{_tmpfilesdir}/%{name}.conf
>-%{_mandir}/man1/incusd*.1.*
>-%attr(700,root,root) %dir %{_localstatedir}/cache/%{name}
>-%attr(700,root,root) %dir %{_localstatedir}/log/%{name}
>-%attr(711,root,root) %dir %{_localstatedir}/lib/%{name}
>-%gopkgfiles
>-
>-%files selinux
>-%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
>-%ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
>-
>-%files client -f incus.lang
>-%license %{golicenses}
>-%{_bindir}/%{name}
>-%dir %{bashcompletiondir}
>-%{bashcompletiondir}/%{name}
>-%{_mandir}/man1/%{name}*.1.*
>-%exclude %{_mandir}/man1/incusd*.1.*
>-%exclude %{_mandir}/man1/incus-agent.1.*
>-%exclude %{_mandir}/man1/incus-benchmark.1.*
>-%exclude %{_mandir}/man1/incus-migrate.1.*
>-%exclude %{_mandir}/man1/lxc-to-incus.1.*
>-%exclude %{_mandir}/man1/lxd-to-incus.1.*
>-
>-%files tools
>-%license %{golicenses}
>-%{_bindir}/fuidshift
>-%{_bindir}/incus-benchmark
>-%{_bindir}/incus-migrate
>-%{_bindir}/lxc-to-incus
>-%{_bindir}/lxd-to-incus
>-%{_mandir}/man1/fuidshift.1.*
>-%{_mandir}/man1/incus-benchmark.1.*
>-%{_mandir}/man1/incus-migrate.1.*
>-%{_mandir}/man1/lxc-to-incus.1.*
>-%{_mandir}/man1/lxd-to-incus.1.*
>-
>-%files agent
>-%license %{golicenses}
>-%{_bindir}/incus-agent
>-%{_mandir}/man1/incus-agent.1.*
>-
>-%files doc
>-%license %{golicenses}
>-%doc doc/html
> 
> %changelog
>-* Fri Jan 26 2024 Neal Gompa <neal@gompa.dev> - 0.5-1
>-- new version
>+* Fri Jan 26 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.5-1
>+- Update to 0.5
>+- Disable building documentation
>+- Restructure packaging to be easier to conditionalize
> 
> * Wed Jan 10 2024 Reto Gantenbein <reto.gantenbein@linuxmonk.ch> 0.4-0.4
> - Add incus-selinux sub package

Actions: View | Diff

Attachments on bug 2260492: 2011019