[xfce-utils] Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313
Kevin Fenzi
kevin at fedoraproject.org
Fri Jan 20 22:00:46 UTC 2012
commit 1af09612a49dec56dbf1a27a87e6e94cb1909d5a
Author: Kevin Fenzi <kevin at scrye.com>
Date: Fri Jan 20 15:00:43 2012 -0700
Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313
xfce-utils-4.8.3-46-migration-gnome.patch | 12 ++++++++++++
xfce-utils.spec | 7 +++++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/xfce-utils-4.8.3-46-migration-gnome.patch b/xfce-utils-4.8.3-46-migration-gnome.patch
index 80bd0ae..4fbad19 100644
--- a/xfce-utils-4.8.3-46-migration-gnome.patch
+++ b/xfce-utils-4.8.3-46-migration-gnome.patch
@@ -8,3 +8,15 @@ diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in xfce-uti
+X-GNOME-Autostart-enabled=false
+OnlyShowIn=XFCE;
Categories=Utility;
+diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in
+--- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in 2011-09-22 13:38:05.000000000 -0600
++++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in 2012-01-20 14:44:29.121871844 -0700
+@@ -127,7 +127,7 @@
+
+ open(DOUT, '>'.$autostart_file) and do {
+ print DOUT "[Desktop Entry]\n";
+- print DOUT "Hidden=true\n";
++ print DOUT "Name=Xfce46Migration\nType=dummy\nHidden=true\n";
+ close(DOUT);
+ } or warn("Unable to write local autostart file: $!");
+ }
diff --git a/xfce-utils.spec b/xfce-utils.spec
index 32307d7..4490c8b 100644
--- a/xfce-utils.spec
+++ b/xfce-utils.spec
@@ -3,7 +3,7 @@
Name: xfce-utils
Version: 4.8.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Utilities for the Xfce Desktop Environment
Group: User Interface/Desktops
@@ -16,7 +16,7 @@ Patch1: xfce-utils-4.4.3-xfterm4-bug.patch
Patch2: xfce-utils-4.7.1-test-running-screensver.patch
Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch
# Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336
-# Prevents gnome from running the 4.6 migration on gnome login.
+# Prevents gnome from running the 4.6 migration on gnome login and fixes the .pl migration tool.
Patch4: xfce-utils-4.8.3-46-migration-gnome.patch
# taken from https://bugzilla.xfce.org/show_bug.cgi?id=8154
Patch5: xfce-utils-4.8.3-check_if_userdir_is_home.patch
@@ -147,6 +147,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_docdir}/%{name}/
%changelog
+* Fri Jan 20 2012 Kevin Fenzi <kevin at scrye.com> 4.8.3-5
+- Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list