PR#96: design-suite: unlist LuxRender-blender from ks file - fedora-kickstarts

		`@@ -1,11 +1,11 @@`
		`# fedora-design-suite.ks`
		`# Based on Live Workstation`
		`# Description:`
		`- # - A Spin targeted towards professional designers`
		`+ # - A collection of applications targeted towards professional visual designers`
		`# Website: http://fedoraproject.org/wiki/Design_Suite`
		`- # Maintainers:`
		`+ # Maintainer:`
		`# - Luya Tshimbalanga <luya AT fedoraproject DOT org>`
		`- # - Previous maintainer Sebastian Dziallas`
		`+ # - Credit to Sebastian Dziallas for initiating the project`

		`%include fedora-live-workstation.ks`

		`@@ -19,7 +19,7 @@`
		`# Added addons to address rhbz#1336879 from dnf`
		`gimp-data-extras`
		`gimp-dbp`
		`- gimp-dds`
		`+ gimp-dds-plugin`
		`gimp-elsamuko`
		`gimp-fourier-plugin`
		`gimp-gap`
		`@@ -39,22 +39,23 @@`
		`gmic-gimp`
		`inkscape-psd`
		`inkscape-sozi`
		`- LuxRender-blender`
		`+ inkscape-table`
		`+ #LuxRender-blender Comment that line because i86 support is no longer available`
		`sane-backends-drivers-scanners`
		`xsane-gimp`
		`#YafaRay-blender`

		`- # Preview Gnome Photos`
		`+ # Add extra gnome applications`
		`+ gnome-books`
		`+ gnome-calendar`
		`gnome-photos`

		`- # Add gthumb for renaming group files`
		`- gthumb`
		`-`
		`# Extra wallpapers`
		`- f23-backgrounds-extras-base`
		`- f23-backgrounds-extras-gnome`
		`f24-backgrounds-extras-base`
		`f24-backgrounds-extras-gnome`
		`+ f25-backgrounds-extras-base`
		`+ f25-backgrounds-extras-gnome`
		`+`

		`# removal of unneeded applications`
		`-gnome-boxes`
		`@@ -67,7 +68,7 @@`
		`#Override the favorite desktop application in Dash`
		`cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE`
		`[org.gnome.shell]`
		`- favorite-apps=['firefox.desktop', 'shotwell.desktop', 'darktable.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']`
		`+ favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']`
		`FOE`

		`# Add link to lists of tutorials`

luya commented 7 years ago

Unlist LuxRender-blender from ks for testing condition statement from comps.xml

ausil commented 7 years ago

This is too much change this late in the f25 cycle

luya commented 7 years ago

Some changes were older and somehow failed to apply to this f25 branch. I don't know if it was bug when I applied a rebase a while ago.

ausil commented 7 years ago

you should rebase on upstream every single time you do anything.

are all of the changes necessary? right now we should only be taking in fixes that fix blocking bugs for the spin

luya commented 7 years ago

Yes. Those changes were intended for F25 branch as well notably the replacement of f23-backgrounds-extras by their f25 version in sync with the main release. I did not realize the change was not applied until recently hence several commits. I sent PR request right after but no one pointed out the mistake.
I will do rebase every time in a future but it will be nice to document the instructions for future spins/labs maintainers.
Thanks for the help.

Edited 7 years ago by luya

luya commented 7 years ago

Considering that majority of commits were synced with master, how to only choose the last fix i.e. removal of LuxRender-blender commit?

luya commented 7 years ago

Looking again at the commit, the changes hardly impact the function overall. Addons are included due to the dnf bug and f25-backgrounds-extras came late as part of Fedora 25 release.