diff options
| -rw-r--r-- | redhat/extras/akode/akode-3.5.13.2.spec | 2 | ||||
| -rw-r--r-- | redhat/extras/trinity-live/fedora-live-tde-base.ks | 58 | ||||
| -rw-r--r-- | redhat/extras/trinity-live/fedora-livecd-tde.ks | 39 | ||||
| -rw-r--r-- | redhat/packages.oss | 10 |
4 files changed, 85 insertions, 24 deletions
diff --git a/redhat/extras/akode/akode-3.5.13.2.spec b/redhat/extras/akode/akode-3.5.13.2.spec index 5a823728c..725a75a26 100644 --- a/redhat/extras/akode/akode-3.5.13.2.spec +++ b/redhat/extras/akode/akode-3.5.13.2.spec @@ -321,7 +321,7 @@ Requires: %{name} = %{version}-%{release} --without-ffmpeg \ %{?_with_libmad} %{!?_with_libmad:--without-libmad} -%__make %{?_smp_mflags} LIBTOOL=$(which libtool) +%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks index 988a2d6a0..3b9caf753 100644 --- a/redhat/extras/trinity-live/fedora-live-tde-base.ks +++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks @@ -1,19 +1,59 @@ # Copied from 'fedora-live-kde-base.ks' %include fedora-live-base.ks + +# Local repository +repo --name="rpmbuild" --baseurl=file:///home/francois/rpmbuild/RPMS/RPMS.fc$releasever/$basearch +repo --name="rpmbuild-noarch" --baseurl=file:///home/francois/rpmbuild/RPMS/RPMS.fc$releasever/noarch + +# Trinity repositories, main mirror. repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch +# RPM Fusion repository +repo --name="RPM Fusion for Fedora - Free" --baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ +repo --name="RPM Fusion for Fedora - Free - Updates" --baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ +repo --name="RPM Fusion for Fedora - Nonfree" --baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ +repo --name="RPM Fusion for Fedora - Nonfree - Updates" --baseurl="http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/" + %packages ### The Trinity Desktop -trinity-desktop -hal +# Required +trinity-hal +trinity-repo + +# Main packages +#trinity-tdeaccessibility +#trinity-tdeaddons +trinity-tdeadmin +#trinity-tdeartwork +trinity-tdebase +#trinity-tdebindings +#trinity-tdeedu +#trinity-tdegames +trinity-tdegraphics +trinity-tdemultimedia +trinity-tdenetwork +trinity-tdepim +trinity-tdeutils +#trinity-tdetoys + +# Subset of tdeaddons +#trinity-atlantikdesigner +trinity-kaddressbook-plugins +trinity-kate-plugins +trinity-tdeaddons-kfile-plugins +trinity-kicker-applets +trinity-knewsticker-scripts +trinity-konq-plugins +trinity-ksig +trinity-noatun-plugins -# TDE is missing a Network Applet, so we use Gnome... -NetworkManager-gnome +# TDE is missing a Network Applet, so we use Gnome... +/usr/bin/nm-applet ### fixes @@ -23,6 +63,9 @@ 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 + %end @@ -30,10 +73,15 @@ alsa-utils # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop <<EOF -DESKTOP="KDE" +DESKTOP="TDE" DISPLAYMANAGER="/opt/trinity/bin/kdm" EOF +# Enable TDM service (systemd) +if [ -r /usr/lib/systemd/system/tdm.service ]; then + ln -s '/usr/lib/systemd/system/tdm.service' '/etc/systemd/system/display-manager.service' +fi + # make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc" diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks index c53e55e23..8afeec7cb 100644 --- a/redhat/extras/trinity-live/fedora-livecd-tde.ks +++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks @@ -13,42 +13,45 @@ %packages # Additional packages that are not default in trinity-desktop but useful -trinity-desktop-extras trinity-live-openbox # Some TDE applications trinity-amarok +trinity-amarok-konqueror trinity-digikam -trinity-dolphin -#trinity-gtk-qt-engine +#trinity-dolphin +trinity-gtk-qt-engine trinity-gwenview trinity-k3b +trinity-k3b-plugin-ffmpeg +trinity-k3b-plugin-lame +trinity-k3b-plugin-mad trinity-kaffeine -trinity-kasablanca -trinity-kbookreader -#trinity-kdebluetooth -trinity-style-lipstik +#trinity-kbookreader +#trinity-kdiff3 #trinity-kgtk-qt3 -trinity-kio-umountwrapper -trinity-kwin-style-crystal #trinity-knetworkmanager -trinity-konversation +#trinity-konversation trinity-kpowersave -trinity-ksensors -trinity-kstreamripper +#trinity-krusader +#trinity-kstreamripper #trinity-smb4k -trinity-yakuake +#trinity-tde-style-lipstik +#trinity-tdeio-umountwrapper +#trinity-tdmtheme +#trinity-twin-style-crystal +#trinity-yakuake # Some TDE translations -#trinity-kde-i18n-French -#trinity-kde-i18n-German -#trinity-kde-i18n-Spanish -#trinity-kde-i18n-Chinese-Big5 +#trinity-tde-i18n-French +#trinity-tde-i18n-German +#trinity-tde-i18n-Spanish +#trinity-tde-i18n-Chinese-Big5 # Fedora stuff fuse liveusb-creator -yumex +#yumex # use yum-presto by default yum-presto diff --git a/redhat/packages.oss b/redhat/packages.oss index f2e79c52e..d44382f16 100644 --- a/redhat/packages.oss +++ b/redhat/packages.oss @@ -46,6 +46,7 @@ libpqxx-devel libwpd-devel wv2-devel fftw-devel +fftw3-devel dssi-devel liblo-devel liblrdf-devel @@ -154,3 +155,12 @@ libtiff-devel aspell hunspell-devel cyrus-sasl-devel +xulrunner-devel +java-1.7.0-openjdk-devel +libacl-devel +python-sip-devel +trinity-PyQt-devel +postgresql +xscreensaver-data-extra +ffmpeg1-devel +recode |