commit 8c702acbc596e01afda43bcbc044e64ad0829d66 Merge: 4f4d1d0 a47186b Author: Luya Tshimbalanga luya@fedoraproject.org Date: Sun Aug 11 19:49:17 2013 -0700
Design: custom menu and addtional packages
INSTALL | 302 ---------------------- Makefile | 38 +++ Makefile.am | 178 ------------- NEWS | 1 - README | 35 +-- configure.ac | 16 -- fedora-aos.ks | 5 +- fedora-arm-base.ks | 26 ++- fedora-arm-desktop-vfat.ks | 10 + fedora-arm-desktop.ks | 10 + fedora-arm-kde-vfat.ks | 11 + fedora-arm-kde.ks | 13 + fedora-arm-lxde-vfat.ks | 11 + fedora-arm-lxde.ks | 1 + fedora-arm-mate-vfat.ks | 13 + fedora-arm-mate.ks | 13 + fedora-arm-minimal-vfat.ks | 17 ++ fedora-arm-minimal.ks | 2 +- fedora-arm-partitioning.ks | 5 + fedora-arm-soas-vfat.ks | 11 + fedora-arm-soas.ks | 11 + fedora-arm-vfat-partitioning.ks | 5 + fedora-arm-xbase.ks | 13 + fedora-arm-xfce-vfat.ks | 11 + fedora-arm-xfce.ks | 1 + fedora-desktop-packages.ks | 26 ++ fedora-install-fedora.ks | 39 +++- fedora-kde-packages.ks | 19 ++ fedora-live-base.ks | 10 +- fedora-live-design-suite.ks | 29 ++- fedora-live-desktop.ks | 19 +-- fedora-live-jam-kde.ks | 6 +- fedora-live-kde-base.ks | 21 +-- fedora-live-mate-compiz.ks | 32 +--- fedora-livecd-desktop.ks | 43 +++- fedora-livecd-lxde.ks | 31 ++- fedora-livecd-mate-compiz.ks | 1 - fedora-livecd-security.ks | 1 - fedora-livecd-soas.ks | 16 +- fedora-livedvd-games.ks | 4 +- fedora-livedvd-scientific-kde.ks | 3 +- fedora-lxde-packages.ks | 10 +- fedora-mate-packages.ks | 29 ++ fedora-repo-not-rawhide.ks | 3 + fedora-repo-rawhide.ks | 1 + fedora-repo.ks | 9 + fedora-soas-packages.ks | 3 + fedora-xfce-packages.ks | 1 - install-sh | 520 -------------------------------------- missing | 376 --------------------------- sources | 2 - spin-kickstarts.spec.in | 178 ------------- 52 files changed, 459 insertions(+), 1732 deletions(-) --- diff --cc fedora-live-design-suite.ks index 89382e4,880f7a0..f453da5 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@@ -17,7 -17,7 +17,11 @@@ part / --size 819 # graphics blender bluefish ++<<<<<<< HEAD +#cinepaint ++======= + #cinepaint will be orphaned soon ++>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac cmyktool darktable dia @@@ -33,10 -29,11 +37,14 @@@ gimp-resynthesize gpick GREYCstoration-gimp hugin -inkscape mypaint +inkscape nautilus-image-converter optipng ++<<<<<<< HEAD ++======= + pencil ++>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac scribus colord-extra-profiles synfigstudio @@@ -92,13 -84,13 +96,23 @@@ overpass-font %end
%post ++<<<<<<< HEAD +#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', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop'] +#Enable categories in Gnome Shell +app-folder-categories=['Utilities', 'Others', 'System Settings', 'Sundry', 'Graphics', 'Games', 'Office', 'Multimedia', 'Network', 'Internet'] +FOE ++======= + + # Set favourite apps for Design Suite + cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE + [org.gnome.shell] + favorite-apps=['firefox.desktop', 'evolution.desktop', 'gimp.desktop', 'shotwell.desktop', 'inkscape.desktop', 'scribus.desktop', 'blender.desktop', 'nautilus.desktop', 'anaconda.desktop'] + FOE + ++>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac
# Add link to the Inkscape Course cat >> /usr/share/applications/inkscape-course.desktop << FOE @@@ -113,10 -105,6 +127,15 @@@ Categories=Graphics;Documentation FOE chmod a+x /usr/share/applications/inkscape-course.desktop
++<<<<<<< HEAD +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + +EOF + +%end ++======= + EOF ++>>>>>>> a47186bb673789cb3ba6bae8af26bf0a86b7dcac
+ %end
-
Luya Tshimbalanga