diff --git a/convert-to-edition.lua b/convert-to-edition.lua index 2a5b9d9..20f847b 100644 --- a/convert-to-edition.lua +++ b/convert-to-edition.lua @@ -64,7 +64,7 @@ end local function clear_presets() local path = "/usr/lib/systemd/system-preset" for file in posix.files(path) do - if file:match("^80-.*%.preset$") then + if file:match("^80%-.*%.preset$") then os.remove(path .. "/" .. file) end end diff --git a/fedora-release.spec b/fedora-release.spec index 3164e0b..b3c1b58 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -9,7 +9,7 @@ Summary: Fedora release files Name: fedora-release Version: 29 -Release: 0.4 +Release: 0.5 License: MIT Group: System Environment/Base URL: https://pagure.io/fedora-release @@ -206,6 +206,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ mkdir -p $RPM_BUILD_ROOT/usr/lib/os.release.d/presets # Default system wide +install -m 0644 90-default-user.preset $RPM_BUILD_ROOT/usr/lib/systemd/user-preset/ install -m 0644 85-display-manager.preset $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ install -m 0644 90-default.preset $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ install -m 0644 99-default-disable.preset $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ @@ -312,6 +313,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %config(noreplace) /etc/issue.net %attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist %dir /usr/lib/systemd/user-preset/ +%{_prefix}/lib/systemd/user-preset/90-default-user.preset %dir %{_prefix}/lib/systemd/system-preset/ %{_prefix}/lib/systemd/system-preset/85-display-manager.preset %{_prefix}/lib/systemd/system-preset/90-default.preset @@ -351,6 +353,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : /usr/sbin/convert-to-edition %changelog +* Fri Jun 22 2018 Mohan Boddu - 29-0.5 +- Add selinux-autorelabel-mark.service to default presets +- Enable the pipewire service for user sessions +- fedora-* renamed to OS independent names +- Fix pattern-match in convert-to-edition.lua + * Fri May 25 2018 Stephen Gallagher - 29-0.4 - Add fedora-repos-modular to Fedora Server installs diff --git a/sources b/sources index 5b81426..9f09dc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fedora-release-29.tar.bz2) = 4b87039bd2954149779079cde8cb7d716bba015a2c3d776227f4c616209a408d2633c669088f7b5de02c2fa1f68274a024a3a2ae23050e848ae3655f69d3e441 +SHA512 (fedora-release-29.tar.bz2) = 5f4ad5c9479dd0b799d3f816d5f194da5c887f7c41127b7a8bd981d99c6ffbe622ee8ffaa24904e073c7bdef6aaab8f5f871e0f5964865af2b9331aed3571c6a