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 c506536..fe88d53 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -5,7 +5,7 @@ Summary: Fedora release files Name: fedora-release Version: 25 -Release: 0.8 +Release: 0.10 License: MIT Group: System Environment/Base URL: http://fedoraproject.org @@ -231,9 +231,7 @@ end %include %{_sourcedir}/convert-to-edition.lua -- If we get to %%posttrans and nothing created /usr/lib/variant, set it to -- nonproduct. -if posix.stat(VARIANT_FILE) == nil then - convert_to_edition("nonproduct", true) -end +install_edition("nonproduct") %post atomichost -p %include %{_sourcedir}/convert-to-edition.lua @@ -333,6 +331,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %config %attr(0644,root,root) /usr/lib/os.release.d/presets/80-workstation.preset %changelog +* Fri Jun 24 2016 Dennis Gilmore - 25-0.10 +- apply fix from adamw for lua globbing bug rhbz#1349664 + +* Thu May 19 2016 Stephen Gallagher - 25-0.9 +- Fix %%posttrans to properly write /usr/lib/variant for nonproduct + * Tue Apr 19 2016 Dennis Gilmore - 25-0.8 - enable virtlogd.socket diff --git a/sources b/sources index 40da0ab..ee55aae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aedd9a548a74f00637fb45fcf27c4f76 fedora-release-25.tar.bz2 +e2497efff58b52fe8f4e5db9188ad129 fedora-release-25.tar.bz2