summaryrefslogtreecommitdiffstats
path: root/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:19:58 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:19:58 +0200
commit2b16f5c5f91f6e90ca6b627daad11cb635dbaed8 (patch)
tree95626bba6231d9a52e0f1d04a8628b8caf129081 /redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
parent14b5a10d92e8fc60d481aba0b9f690c851ed8b71 (diff)
downloadtde-packaging-2b16f5c5f91f6e90ca6b627daad11cb635dbaed8.tar.gz
tde-packaging-2b16f5c5f91f6e90ca6b627daad11cb635dbaed8.zip
Mageia 2: add support for MGA2 build in redhat packages
Diffstat (limited to 'redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch')
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
new file mode 100644
index 000000000..75fdf0610
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
@@ -0,0 +1,31 @@
+commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date: 1337622268 -0500
+
+ Reverse patch from GIT hash 2cc2e3a2.
+
+diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
+index 237c95d..a8a419f 100644
+--- a/kmix/CMakeLists.txt
++++ b/kmix/CMakeLists.txt
+@@ -26,7 +26,6 @@ link_directories(
+ ##### other data ################################
+
+ install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+ install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
+ install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+ install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+diff --git a/kmix/Makefile.am b/kmix/Makefile.am
+index d2da702..5051363 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 = kmix.desktop restore_kmix_volumes.desktop
++autostart_DATA = restore_kmix_volumes.desktop
+ autostartdir = $(datadir)/autostart
+
+ lnkdir = $(kde_datadir)/kicker/applets