PR#2: Don't install systemd unit files neither udev rules for Flatpak - rpms/phodav

rpms / phodav

#2 Don't install systemd unit files neither udev rules for Flatpak

Merged 4 years ago by elmarco. Opened 4 years ago by feborges.

rpms/ feborges/phodav disable-for-flatpak into master

Don't install systemd unit files neither udev rules for Flatpak

Felipe Borges • 4 years ago

24cecbb

phodav.spec

file modified

+4 -1

		`@@ -71,7 +71,8 @@`


		`%build`
		`- %meson \|\| cat %_vpath_builddir/meson-logs/meson-log.txt`
		`+ %meson %{?flatpak:-Dsystemd=disabled -Dudev=disabled} \|\| cat %_vpath_builddir/meson-logs/meson-log.txt`
		`+`
		`%meson_build`

		`%install`
		`@@ -108,8 +109,10 @@`
		`%files -n spice-webdavd`
		`%license COPYING`
		`%{_sbindir}/spice-webdavd`
		`+ %if ! 0%{?flatpak}`
		`/usr/lib/udev/rules.d/70-spice-webdavd.rules`
		`%{_unitdir}/spice-webdavd.service`
		`+ %endif`

		`%changelog`
		`* Tue Feb 26 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 2.3-1`

feborges commented 4 years ago

We are building Flatpaks from RPMs[0], and for these we don't want
systemd unit files nor udev rules to be installed, since Flatpak
installs files in a different prefix within a container.

The "flatpak" macro is provided by the package flatpak-rpm-macros.
It is already used in various RPMs such as spice-gtk, gedit,
file-roller.

[0] https://docs.fedoraproject.org/en-US/flatpak/tutorial/