[wallpapoz] Return to set default WM to GNOME3 when proper WM is not found

[Mamoru Tasaka]

commit b159bff0f9cd124987248bd28b1751500aaf0dcc
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Sep 18 12:48:41 2012 +0900

    Return to set default WM to GNOME3 when proper WM is not found
    
      (bug 857587)

 wallpapoz-0.6.2-wm-return-to-default.patch |   20 ++++++++++++++++++++
 wallpapoz.spec                             |   15 ++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/wallpapoz-0.6.2-wm-return-to-default.patch b/wallpapoz-0.6.2-wm-return-to-default.patch
new file mode 100644
index 0000000..976589c
--- /dev/null
+++ b/wallpapoz-0.6.2-wm-return-to-default.patch
@@ -0,0 +1,20 @@
+--- wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py.default	2012-09-18 12:31:45.855406125 +0900
++++ wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py	2012-09-18 12:37:03.387072341 +0900
+@@ -108,6 +108,7 @@
+     if wm_name=='Xfwm4':
+       self.window_manager = 'XFCE4'
+     else:
++     try:
+       output = os.popen("gnome-session --version")
+       result = output.readlines()
+       version = result[0].split()[1].split('.')[0]
+@@ -115,6 +116,9 @@
+         self.window_manager = 'Gnome'
+       elif version == '3':
+         self.window_manager = 'Gnome3'
++     except:
++      # If something went wrong, just ignore
++      pass
+ 
+   ## class method to find amount of workspaces in user desktop
+   def finding_total_workspaces(self):
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 2508bd1..ff5dbfe 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      1
+%define         fedorarel      2
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -68,6 +68,9 @@ Patch12:	wallpapoz-0.5-startup-warn-about-workspace-name.patch
 # with workspace number increased
 # bug 708769
 Patch13:	wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
+# Return to set default WM to GNOME3 when proper WM is not found
+# (bug 857587)
+Patch14:	wallpapoz-0.6.2-wm-return-to-default.patch
 
 BuildArch:      noarch
 
@@ -106,11 +109,9 @@ wallpapers for different workspaces or virtual desktops.
 %patch8 -p1 -b .nonutf8
 %patch9 -p1 -b .deletelastone
 %patch10 -p1 -b .deletefirst
-%if 0%{?fedora} >= 15
-#%%patch11 -p1 -b .gsettings
-%endif
 %patch12 -p1 -b .workspace_img
 %patch13 -p1 -b .workspace_num_incr
+%patch14 -p1 -b .default
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -182,6 +183,10 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 18 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.2-2
+- Return to set default WM to GNOME3 when proper WM is not found
+  (bug 857587)
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild