RPM Packaging: update 14.0.0 packages

2 files changed, 75 insertions, 22 deletions

diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index 3b9caf753..a1733e811 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -20,36 +20,78 @@ repo --name="RPM Fusion for Fedora - Nonfree - Updates" --baseurl="http://downlo
 
 ### The Trinity Desktop
 
-# Required
-trinity-hal
-trinity-repo
-
 # Main packages
 #trinity-tdeaccessibility
 #trinity-tdeaddons
-trinity-tdeadmin
+#trinity-tdeadmin
 #trinity-tdeartwork
 trinity-tdebase
 #trinity-tdebindings
 #trinity-tdeedu
 #trinity-tdegames
-trinity-tdegraphics
-trinity-tdemultimedia
-trinity-tdenetwork
-trinity-tdepim
-trinity-tdeutils
+#trinity-tdegraphics
+trinity-tdelibs
+#trinity-tdemultimedia
+#trinity-tdenetwork
+#trinity-tdepim
+#trinity-tdeutils
 #trinity-tdetoys
 
+# Subset of tdegraphics
+trinity-kamera
+trinity-kcoloredit
+#trinity-tdegraphics-kfile-plugins
+#trinity-kdvi
+#trinity-kfax
+#trinity-kfaxview
+trinity-kgamma
+#trinity-kghostview
+#trinity-kiconedit
+#trinity-kmrml
+#trinity-kolourpaint
+#trinity-kooka
+trinity-kpdf
+#trinity-kpovmodeler
+#trinity-kruler
+trinity-ksnapshot
+#trinity-ksvg
+#trinity-kview
+trinity-kviewshell
+#trinity-libkscan
+trinity-tdegraphics-libpoppler-tqt
+
+# Subset of tdeutils
+trinity-ark
+trinity-kcalc
+#trinity-kcharselect
+#trinity-kdelirc
+#trinity-kdessh
+#trinity-kdf
+#trinity-kedit
+#trinity-kfloppy
+#trinity-kgpg
+#trinity-khexedit
+#trinity-kjots
+#trinity-klaptopdaemon
+#trinity-kmilo
+#trinity-kmilo-legacy
+trinity-kregexpeditor
+trinity-ksim
+#trinity-ktimer
+trinity-kwalletmanager
+#trinity-superkaramba
+
+
 # Subset of tdeaddons
 #trinity-atlantikdesigner
-trinity-kaddressbook-plugins
+#trinity-kaddressbook-plugins
 trinity-kate-plugins
-trinity-tdeaddons-kfile-plugins
+#trinity-tdeaddons-kfile-plugins
 trinity-kicker-applets
-trinity-knewsticker-scripts
+#trinity-knewsticker-scripts
 trinity-konq-plugins
-trinity-ksig
-trinity-noatun-plugins
+#trinity-ksig
+#trinity-noatun-plugins
 
 
 # TDE is missing a Network Applet, so we use Gnome...
@@ -63,8 +105,19 @@ alsa-utils
 # make sure gnome-packagekit doesn't end up the KDE live images
 -gnome-packagekit*
 
-# use kde-print-manager instead of system-config-printer
--system-config-printer-libs
+# Remove printing support
+-cups
+-cups-filters
+-cups-filesystem
+-cups-pk-helper
+-foomatic*
+-gutenprint*
+-paps
+-system-config-printer*
+
+# Remove bluetooth support
+-bluez
+-bluez-cups
 
 %end
 
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index 8afeec7cb..7550ed9ea 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -17,15 +17,15 @@ trinity-live-openbox
 
 # Some TDE applications
 trinity-amarok
-trinity-amarok-konqueror
-trinity-digikam
+#trinity-amarok-konqueror
+#trinity-digikam
 #trinity-dolphin
 trinity-gtk-qt-engine
 trinity-gwenview
 trinity-k3b
-trinity-k3b-plugin-ffmpeg
-trinity-k3b-plugin-lame
-trinity-k3b-plugin-mad
+#trinity-k3b-plugin-ffmpeg
+#trinity-k3b-plugin-lame
+#trinity-k3b-plugin-mad
 trinity-kaffeine
 #trinity-kbookreader
 #trinity-kdiff3