diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-06-04 23:05:28 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-06-04 23:05:28 +0200 |
| commit | a8d78224c6ea9b943357902276de7a513d0fbd8d (patch) | |
| tree | b1fc22b372792bf2cd2b3bd9add09fb3df8e71ff /redhat/kdemultimedia | |
| parent | 7f3d4fcab8d85cda8766150784e9133f61110019 (diff) | |
| download | tde-packaging-a8d78224c6ea9b943357902276de7a513d0fbd8d.tar.gz tde-packaging-a8d78224c6ea9b943357902276de7a513d0fbd8d.zip | |
RHEL/Fedora: various updates
Diffstat (limited to 'redhat/kdemultimedia')
| -rw-r--r-- | redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch | 20 | ||||
| -rw-r--r-- | redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 12 |
2 files changed, 29 insertions, 3 deletions
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch new file mode 100644 index 000000000..7b22862d3 --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch @@ -0,0 +1,20 @@ +commit 2cc2e3a2f6d1afd47cc076b89215ac41a0d41a92 +Author: Darrell Anderson <humanreadable@yahoo.com> +Date: 1336512887 -0500 + + Fix kmix not autostarting in the user's session. + This resolves bug report 503. + +diff --git a/kmix/Makefile.am b/kmix/Makefile.am +index 5051363..d2da702 100644 +--- a/kmix/Makefile.am ++++ b/kmix/Makefile.am +@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop + rcdir = $(kde_datadir)/kmix + rc_DATA = kmixui.rc + +-autostart_DATA = restore_kmix_volumes.desktop ++autostart_DATA = kmix.desktop restore_kmix_volumes.desktop + autostartdir = $(datadir)/autostart + + lnkdir = $(kde_datadir)/kicker/applets diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index a0c5fd3a4..262776d5b 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -25,7 +25,7 @@ Name: trinity-kdemultimedia Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Version: 3.5.13 -Release: 6%{?dist}%{?_variant} +Release: 7%{?dist}%{?_variant} License: GPLv2 Group: Applications/Multimedia @@ -53,7 +53,8 @@ Patch10: kdemultimedia-3.5.13-fix_mmx_detection.patch Patch21: kdemultimedia-3.5.13-remove_more_applications.patch # [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf] Patch22: kdemultimedia-3.5.13-fix_linear_alphabet.patch - +# [tdemultimedia] Fix kmix not autostarting in the user's session. [Bug #503] +Patch23: kdemultimedia-3.5.13-fix_kmix_autostart.patch Requires: %{name}-libs = %{version}-%{release} @@ -135,8 +136,10 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread %patch10 -p1 -%patch21 -p1 +%patch21 -p1 -b .moreapplications %patch22 -p1 +%patch23 -p1 -b .kmixautostart + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -416,6 +419,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libyafxplayer.so %changelog +* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7 +- Fix kmix not autostarting in the user's session. [Bug #503] + * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 - Updates BuildRequires - Remove "More Applications" from TDE menu. [Commit #31e44a7b] |