summaryrefslogtreecommitdiffstats
path: root/redhat/extras/trinity-live
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-10-21 19:23:00 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-10-21 19:23:00 +0200
commit59daf455b483742c6c47099652117074df37889a (patch)
tree5271c465e9468df4e8fe1814bdb413164b40823e /redhat/extras/trinity-live
parent7834467b40a454432c3f8d84b6b43e299afe4933 (diff)
downloadtde-packaging-59daf455b483742c6c47099652117074df37889a.tar.gz
tde-packaging-59daf455b483742c6c47099652117074df37889a.zip
RHEL/Fedora/MGA/MDV/Suse: update extras for TDE 3.5.13.1
Diffstat (limited to 'redhat/extras/trinity-live')
-rw-r--r--redhat/extras/trinity-live/fedora-live-tde-base.ks2
-rw-r--r--redhat/extras/trinity-live/fedora-livecd-tde.ks2
-rw-r--r--redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz0
-rw-r--r--redhat/extras/trinity-live/trinity-live.spec11
4 files changed, 9 insertions, 6 deletions
diff --git a/redhat/extras/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks
index c54b149d2..988a2d6a0 100644
--- a/redhat/extras/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/extras/trinity-live/fedora-live-tde-base.ks
@@ -3,8 +3,6 @@
%include fedora-live-base.ks
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
-repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch
-repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch
%packages
diff --git a/redhat/extras/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks
index 6c926a25a..c53e55e23 100644
--- a/redhat/extras/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/extras/trinity-live/fedora-livecd-tde.ks
@@ -26,7 +26,7 @@ trinity-k3b
trinity-kaffeine
trinity-kasablanca
trinity-kbookreader
-trinity-kdebluetooth
+#trinity-kdebluetooth
trinity-style-lipstik
#trinity-kgtk-qt3
trinity-kio-umountwrapper
diff --git a/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/redhat/extras/trinity-live/trinity-live-3.5.13.tar.gz
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index 6588028da..66b495c48 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -1,8 +1,10 @@
%define _prefix /usr
+%define tde_bindir %{tde_prefix}/bin
+
Name: trinity-live
-Version: 3.5.13
-Release: 4%{?dist}
+Version: 3.5.13.1
+Release: 1%{?dist}
License: GPL
Summary: Trinity Spins
Group: Applications/System
@@ -45,7 +47,7 @@ cat <<EOF >openbox
# This script is used by 'firstboot' only.
# It allows to run TDE's kwin instead of openbox.
-export PATH=%{_bindir}:\${PATH}
+export PATH=%{tde_bindir}:\${PATH}
export HOME=/root
rm -rf \${HOME}/.DCOPserver*
@@ -73,6 +75,9 @@ EOF
%changelog
+* Sun Oct 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
+
* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Updates with new split packages