From d2ba782b32238ccf403cd4905e42f39764523ec6 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Mon, 28 Nov 2011 19:08:25 +0900
Subject: [PATCH 01/57] More strict check on daemon_wallpapoz startup for xprop
 (bug 711541)

---
 ...papoz-0.4.1-rev92-kill-daemon-without-x.patch | 16 +++++++++-------
 wallpapoz.spec                                   |  8 +++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch b/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
index f394d8f..728aeea 100644
--- a/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
+++ b/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2010-03-18 00:52:45.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-03-18 01:00:30.000000000 +0900
+--- wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2011-11-28 18:16:13.959482838 +0900
++++ wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py	2011-11-28 18:19:02.545376745 +0900
 @@ -24,9 +24,11 @@
  ## wallpapoz_system.py -- finds current desktop and changes wallpaper
  # achieve goal by calling external program
@@ -12,7 +12,7 @@
  
  class WallpapozSystem:
  
-@@ -59,12 +61,46 @@
+@@ -59,12 +61,48 @@
        print "daemon_wallpapoz: respawning daemon_wallpapoz."
        self.respawn_system()
  
@@ -41,6 +41,8 @@
 +
 +    if (cmd.find('xprop') >= 0) and (pstdout.find('no such atom') >= 0):
 +        kill_daemon = True
++    if (cmd.find('xprop') >= 0) and (pstdout.find('not') >= 0):
++        kill_daemon = True
 +
 +    if kill_daemon:
 +        ## No X resource available, kill daemon_wallpapoz
@@ -60,7 +62,7 @@
      start_width = raw_resolution.find('Width')
      end_width = raw_resolution.find('\n',start_width)
      start_height = raw_resolution.find('Height')
-@@ -77,7 +113,7 @@
+@@ -77,7 +115,7 @@
      if self.beryl:
        self.total_workspaces = self.row_workspaces * self.column_workspaces
      else:
@@ -69,7 +71,7 @@
  
      # Save this total_workspaces value
      if not WallpapozSystem.static_finding_total_workspaces_called_p:
-@@ -86,7 +122,7 @@
+@@ -86,7 +124,7 @@
  
    ## class method to find if user use beryl in his system or not
    def check_beryl(self):
@@ -78,7 +80,7 @@
      # output of xprop -root _NET_DESKTOP_GEOMETRY is '_NET_DESKTOP_GEOMETRY(CARDINAL) = 1024, 768\n'
      # and we just need the '1024, 768' part
      raw_geometry = raw_geometry[34:raw_geometry.find('\n')]
-@@ -117,7 +153,7 @@
+@@ -117,7 +155,7 @@
    ## class method to know what workspace we are in now
    def current_desktop(self):
      if self.beryl:
@@ -87,7 +89,7 @@
        # output of xprop -root _NET_DESKTOP_VIEWPORT is '_NET_DESKTOP_VIEWPORT(CARDINAL) = 1024, 768\n'
        # and we just need the '1024, 768' part
        raw_viewport = raw_viewport[34:raw_viewport.find('\n')]
-@@ -126,7 +162,7 @@
+@@ -126,7 +164,7 @@
        y_pos = int(viewport[1]) / self.screen_height
        workspace = x_pos + self.column_workspaces * y_pos
      else:
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 0d6f5ae..dff3d7f 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.5
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      8
+%define         fedorarel      9
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -26,6 +26,7 @@ Source11:       wallpapoz-autostart.desktop
 %endif
 # Install daemon_wallpapoz wrapper script, which may
 # fix 584980, 597687?
+# and 711541
 Source12:	daemon_wallpapoz-wrapper
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
@@ -40,6 +41,7 @@ Patch4:         wallpapoz-0.4.1-rev92-paste-initialization.patch
 # Kill daemon_wallpapoz when X resource is no longer available
 # bug 531343, 538533, 541434, 556377, 569135, 571827
 # (and bug 566594)
+# (and bug 711541)
 Patch5:         wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
 # Kill other daemon_wallpapoz if running
 Patch6:         wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch
@@ -176,6 +178,10 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Mon Nov 28 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.5-9
+- More strict check on daemon_wallpapoz startup for xprop
+  (bug 711541)
+
 * Wed Jun  1 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.5-8
 - Fix crash witching from desktop style XML to workspace style one
   with workspace number increased (bug 708769)

From 53d799aea526d3af6a14a3bab20d23a521c4d1d7 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Mon, 28 Nov 2011 19:10:16 +0900
Subject: [PATCH 02/57] Add more fixes

---
 daemon_wallpapoz-wrapper | 73 ++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/daemon_wallpapoz-wrapper b/daemon_wallpapoz-wrapper
index 89ea42d..bb0d5df 100644
--- a/daemon_wallpapoz-wrapper
+++ b/daemon_wallpapoz-wrapper
@@ -4,25 +4,78 @@ which xprop &>/dev/null || exit 1
 sleep 2
 
 TRIAL=0
+FOUND=0
 PROGNAME=$0
 while true ; do
-	RESULT=$(xprop -root _NET_DESKTOP_GEOMETRY 2>/dev/null)
+	if test $TRIAL -ge 6 ; then
+		echo "$PROGNAME: not lauching daemon_wallpapoz"
+		exit 1
+	fi
+
+	COMMAND="xprop -root _NET_NUMBER_OF_DESKTOPS 2>/dev/null"
+	RESULT=$(eval "$COMMAND")
+	RESULT=${RESULT:36}
+	if ( (test -z "$RESULT" ) || ! (echo "$RESULT" | grep -q "^[0-9]" ) ) ; then
+		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
+		TRIAL=$((TRIAL+1))
+		sleep 3
+		continue
+	fi
+
+	COMMAND="xprop -root _NET_DESKTOP_GEOMETRY 2>/dev/null"
+	RESULT=$(eval "$COMMAND")
 	RESULT=${RESULT:34}
 	WIDTH=$(echo $RESULT | sed -e 's|,.*$||')
 	HEIGHT=$(echo $RESULT | sed -e 's|^.*,||' | sed -e 's|^[ \t][ \t]*||')
-	if [[ ( -z $WIDTH ) || ( -z $WIDTH ) ]] ; then
+	if ( (test -z "$WIDTH" ) || ! (echo "$WIDTH" | grep -q "^[0-9]" ) ) ; then
 		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
 		TRIAL=$((TRIAL+1))
-		echo "$PROGNAME: xprop returned unexpected result for $TRIAL times"
-		if test $TRIAL -ge 4 ; then
-			echo "$PROGNAME: not lauching daemon_wallpapoz"
-			exit 1
-		fi
 		sleep 3
-	else
-		# xprop succeeded
-		break
+		continue
 	fi
+	if ( (test -z "$HEIGHT" ) || ! (echo "$HEIGHT" | grep -q "^[0-9]" ) ) ; then
+		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
+		TRIAL=$((TRIAL+1))
+		sleep 3
+		continue
+	fi
+
+	COMMAND="xprop -root _NET_DESKTOP_VIEWPORT 2>/dev/null"
+	RESULT=$(eval "$COMMAND")
+	RESULT=${RESULT:34}
+	WIDTH=$(echo $RESULT | sed -e 's|,.*$||')
+	HEIGHT=$(echo $RESULT | sed -e 's|^.*,||' | sed -e 's|^[ \t][ \t]*||')
+	if ( (test -z "$WIDTH" ) || ! (echo "$WIDTH" | grep -q "^[0-9]" ) ) ; then
+		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
+		TRIAL=$((TRIAL+1))
+		sleep 3
+		continue
+	fi
+	if ( (test -z "$HEIGHT" ) || ! (echo "$HEIGHT" | grep -q "^[0-9]" ) ) ; then
+		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
+		TRIAL=$((TRIAL+1))
+		sleep 3
+		continue
+	fi
+
+	COMMAND="xprop -root _NET_CURRENT_DESKTOP 2>/dev/null"
+	RESULT=$(eval "$COMMAND")
+	RESULT=${RESULT:33}
+	if ( (test -z "$RESULT" ) || ! (echo "$RESULT" | grep -q "^[0-9]" ) ) ; then
+		# xprop failed
+		echo "daemon_wallpapoz: $COMMAND failed at startup, retrying after 3 seconds..."
+		TRIAL=$((TRIAL+1))
+		sleep 3
+		continue
+	fi
+
+	# succeeded
+	break
 done
 
 exec /usr/libexec/daemon_wallpapoz "$@"

From c8a0b370e8e40ecc9a0349194f7f842bd0ba4a6a Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Fri, 30 Dec 2011 15:57:09 +0900
Subject: [PATCH 03/57] Forgot to apply patch13...

---
 wallpapoz.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index dff3d7f..eaf1cc9 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.5
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      9
+%define         fedorarel      10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -110,6 +110,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch11 -p1 -b .gsettings
 %endif
 %patch12 -p1 -b .workspace_img
+%patch13 -p1 -b .workspace_num_incr
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -178,6 +179,9 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Dec 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.5-10
+- Forgot to apply patch13...
+
 * Mon Nov 28 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.5-9
 - More strict check on daemon_wallpapoz startup for xprop
   (bug 711541)

From 2626ad8496290c6542e8ca9982af16e41271495a Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Fri, 30 Dec 2011 16:20:53 +0900
Subject: [PATCH 04/57] Update to 0.6.1

---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 wallpapoz-0.4.1-rev92-compiz-respawn.patch    | 109 ------------------
 ...1-rev92-delete-first-in-desktop-mode.patch |  18 ---
 wallpapoz-0.4.1-rev92-dircheck.patch          |  84 --------------
 wallpapoz-0.4.1-rev92-nonutf8-directory.patch |  22 ----
 wallpapoz-0.5-gsettings.patch                 |  32 -----
 ...r-to-desktop-with-workspace-increase.patch |  22 ----
 ...ch => wallpapoz-0.6.1-animated-image.patch |  14 +--
 ...z-0.6.1-delete-first-in-desktop-mode.patch |  18 +++
 wallpapoz-0.6.1-delete-one-wallpaper.patch    | 107 +++++++++++++++++
 wallpapoz-0.6.1-dircheck.patch                |  84 ++++++++++++++
 ...allpapoz-0.6.1-kill-daemon-without-x.patch |  56 ++++-----
 ...wallpapoz-0.6.1-kill-multiple-daemon.patch |  21 ++--
 wallpapoz-0.6.1-nonutf8-directory.patch       |  22 ++++
 ...r-to-desktop-with-workspace-increase.patch |  21 ++++
 wallpapoz-0.6.1-workspace-num-respawn.patch   |  74 ++++++++++++
 wallpapoz.spec                                |  40 ++++---
 18 files changed, 393 insertions(+), 354 deletions(-)
 delete mode 100644 wallpapoz-0.4.1-rev92-compiz-respawn.patch
 delete mode 100644 wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
 delete mode 100644 wallpapoz-0.4.1-rev92-dircheck.patch
 delete mode 100644 wallpapoz-0.4.1-rev92-nonutf8-directory.patch
 delete mode 100644 wallpapoz-0.5-gsettings.patch
 delete mode 100644 wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
 rename wallpapoz-0.4.1-rev92-animated-image.patch => wallpapoz-0.6.1-animated-image.patch (61%)
 create mode 100644 wallpapoz-0.6.1-delete-first-in-desktop-mode.patch
 create mode 100644 wallpapoz-0.6.1-delete-one-wallpaper.patch
 create mode 100644 wallpapoz-0.6.1-dircheck.patch
 rename wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch => wallpapoz-0.6.1-kill-daemon-without-x.patch (53%)
 rename wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch => wallpapoz-0.6.1-kill-multiple-daemon.patch (50%)
 create mode 100644 wallpapoz-0.6.1-nonutf8-directory.patch
 create mode 100644 wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
 create mode 100644 wallpapoz-0.6.1-workspace-num-respawn.patch

diff --git a/.gitignore b/.gitignore
index a8de773..8e8ed4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 wallpapoz-0.4.1-svn92_trunk.tar.bz2
 /wallpapoz-0.5.tar.bz2
+/wallpapoz-0.6.1.tar.bz2
diff --git a/sources b/sources
index c10d97b..cd74978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95231129c118034b0ae49e0960e409d9  wallpapoz-0.5.tar.bz2
+e89f1988af6eb70a8bee0cb3a36bd854  wallpapoz-0.6.1.tar.bz2
diff --git a/wallpapoz-0.4.1-rev92-compiz-respawn.patch b/wallpapoz-0.4.1-rev92-compiz-respawn.patch
deleted file mode 100644
index bd773d3..0000000
--- a/wallpapoz-0.4.1-rev92-compiz-respawn.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.compiz	2009-08-30 01:22:07.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-03-18 00:40:58.000000000 +0900
-@@ -25,18 +25,40 @@
- # achieve goal by calling external program
- 
- import os
-+import sys
- import string
- 
- class WallpapozSystem:
- 
-+  # Define static variable to save the initial value of self.beryl
-+  static_check_beryl_called_p = False
-+  static_beryl = False
-+
-+  # Also for total_workspaces
-+  static_finding_total_workspaces_called_p = False
-+  static_total_workspaces = 0
-+
-   def __init__(self):
-     self.wallpaper_style = 'scaled'
-     self.finding_screen_resolution()
-+
-+    # Save the first result of self.beryl, and respawn daemon
-+    # if self.beryl value changed.
-     self.check_beryl()
-+    if not WallpapozSystem.static_check_beryl_called_p :
-+      WallpapozSystem.static_check_beryl_called_p = True
-+      WallpapozSystem.static_beryl = self.beryl
-+
-     if self.beryl:
-       self.finding_row_and_column()
-     self.finding_total_workspaces()
- 
-+    # Check if total_workspaces changed only here
-+    if WallpapozSystem.static_total_workspaces != self.total_workspaces:
-+      print "daemon_wallpapoz: the number of total workspaces changed during initialization process."
-+      print "daemon_wallpapoz: respawning daemon_wallpapoz."
-+      self.respawn_system()
-+
-   def set_style(self, style):
-     self.wallpaper_style = style
- 
-@@ -57,6 +79,11 @@
-     else:
-       self.total_workspaces = int(os.popen("xprop -root _NET_NUMBER_OF_DESKTOPS").read()[36:38])
- 
-+    # Save this total_workspaces value
-+    if not WallpapozSystem.static_finding_total_workspaces_called_p:
-+      WallpapozSystem.static_finding_total_workspaces_called = True
-+      WallpapozSystem.static_total_workspaces = self.total_workspaces
-+
-   ## class method to find if user use beryl in his system or not
-   def check_beryl(self):
-     raw_geometry = os.popen('xprop -root _NET_DESKTOP_GEOMETRY').read()
-@@ -69,10 +96,15 @@
-     self.beryl = False
-     if self.geometry_width!=self.screen_width:
-       self.beryl = True
--      return
--    if self.geometry_height!=self.screen_height:
-+    elif self.geometry_height!=self.screen_height:
-       self.beryl = True
- 
-+    # respawn daemon if self.beryl value changed
-+    if WallpapozSystem.static_check_beryl_called_p:
-+      if WallpapozSystem.static_beryl != self.beryl:
-+        print "Compiz status changed, respawning daemon_wallpapoz."
-+        self.respawn_system()
-+
-   ## class method to find how many rows and columns of workspaces
-   def finding_row_and_column(self):
-     self.row_workspaces = self.geometry_height / self.screen_height
-@@ -113,3 +145,11 @@
-       return True
-     else:
-       return False
-+
-+  def respawn_system(self):
-+    new_argv = []
-+    new_argv.extend(sys.argv)
-+    os.execvp('daemon_wallpapoz', new_argv)
-+    print "os.execvp failed, exiting..."
-+    sys.exit(1)
-+
---- wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz.compiz	2009-08-30 01:22:07.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz	2010-03-18 00:25:42.000000000 +0900
-@@ -134,11 +134,20 @@
-     if wallpapozxml.get_type() == "workspace":
-       while True:
- 	# don't get rush
--	time.sleep(1)
-+       # sleep a bit more
-+	time.sleep(2)
-+
-+	# check if compiz is working every loop (and
-+	# if compiz status changed, respawn daemon)
-+	wallpapoz_system.check_beryl()
- 
- 	# what workspace we are in now?
- 	cur_desk = wallpapoz_system.current_desktop()
- 
-+        if cur_desk >= wallpapoz_system.get_total_workspaces() :
-+          # ignore
-+          continue
-+
- 	# requirement for changing wallpaper
- 	# 1. we change workspace
- 	# 2. index of wallpaper list change
diff --git a/wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch b/wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
deleted file mode 100644
index ac27fc6..0000000
--- a/wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.deletefirst	2010-06-15 01:45:58.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-15 02:09:59.000000000 +0900
-@@ -1070,13 +1070,13 @@
- 	lowest_iter = self.store.get_iter((path_iter-1,))
-       else:
- 	index_temp = 0
-+	before_path_iter = 0
- 	for single_iter in self.selected_iter[1:]:
- 	  path_iter = self.store.get_path(single_iter)[0]
- 	  if path_iter == (index_temp + 1):
- 	    index_temp = index_temp + 1
- 	    before_path_iter = path_iter
--	  else:
--	    lowest_iter = self.store.get_iter((before_path_iter+1,))
-+	lowest_iter = self.store.get_iter((before_path_iter+1,))
- 	    
-       # remove the iter
-       for single_iter in self.selected_iter:
diff --git a/wallpapoz-0.4.1-rev92-dircheck.patch b/wallpapoz-0.4.1-rev92-dircheck.patch
deleted file mode 100644
index d95bc9d..0000000
--- a/wallpapoz-0.4.1-rev92-dircheck.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.dircheck	2010-02-08 02:25:38.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-02-08 02:16:08.000000000 +0900
-@@ -538,6 +538,9 @@
-         # if recursive, we use walktree
- 	if recursive_widget.get_active():
- 	  # looping with walktree method
-+          if not os.path.isdir(cur_dir):
-+            return
-+
- 	  for (basepath, children) in self.walktree(cur_dir,False):
- 	    for child in children:
- 	      # get the filename
-@@ -553,7 +556,11 @@
-         # if not just looping the directory with ordinary fashion
- 	else:
- 	  # looping all files in this directory
--	  for file in os.listdir(cur_dir):
-+          try:
-+            dlist = os.listdir(cur_dir)
-+          except OSError:
-+            return
-+	  for file in dlist:
- 	    # get the filename
- 	    filename = os.path.join(cur_dir, file)
- 	    # we interested in file, not directory
-@@ -575,6 +582,9 @@
-         # if recursive, we use walktree
- 	if recursive_widget.get_active():
- 	  # looping with walktree method
-+          if not os.path.isdir(cur_dir):
-+            return
-+
- 	  for (basepath, children) in self.walktree(cur_dir,False):
- 	    for child in children:
- 	      # get the filename
-@@ -590,7 +600,11 @@
-         # if not, just looping with ordinary fashion
-         else:
- 	  # looping all files in this directory
--	  for file in os.listdir(cur_dir):
-+          try:
-+            ddir = os.listdir(cur_dir)
-+          except OSError:
-+            return
-+	  for file in ddir:
- 	    # get the filename
- 	    filename = os.path.join(cur_dir, file)
- 	    # we interested in file, not directory
-@@ -620,6 +634,9 @@
-       cur_dir = filechooser_widget.get_filename()
-       # if recursive, we use walktree
-       if recursive_widget.get_active():
-+        if not os.path.isdir(cur_dir):
-+          return
-+
- 	# looping with walktree method
- 	for (basepath, children) in self.walktree(cur_dir,False):
- 	  for child in children:
-@@ -636,7 +653,11 @@
-       # if not recursive, just looping the directory with ordinary fashion
-       else:
- 	# looping all files in this directory
--	for file in os.listdir(cur_dir):
-+        try:
-+          dlist = os.listdir(cur_dir)
-+        except OSError:
-+          return
-+	for file in dlist:
- 	  # get the filename
- 	  filename = os.path.join(cur_dir, file)
- 	  # we interested in file, not directory
-@@ -1219,7 +1240,11 @@
- 
-   # helping method
-   def walktree (self, top = ".", depthfirst = True):
--    names = os.listdir(top)
-+    try:
-+      names = os.listdir(top)
-+    except OSError:
-+      names = []
-+      yield top, names
-     if not depthfirst:
-       yield top, names
-     for name in names:
diff --git a/wallpapoz-0.4.1-rev92-nonutf8-directory.patch b/wallpapoz-0.4.1-rev92-nonutf8-directory.patch
deleted file mode 100644
index 6c4157c..0000000
--- a/wallpapoz-0.4.1-rev92-nonutf8-directory.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.nonutf8	2010-06-13 01:21:08.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-13 01:39:08.000000000 +0900
-@@ -543,6 +543,9 @@
- 	num_of_child = self.store.iter_n_children(iter)
- 	# what is the directory?
- 	cur_dir = filechooser_widget.get_filename()
-+	# get_filename can return NoneType (for non-UTF8 directory)
-+	if not cur_dir:
-+	  return
-         # if recursive, we use walktree
- 	if recursive_widget.get_active():
- 	  # looping with walktree method
-@@ -587,6 +590,9 @@
- 	new_index = self.store.get_value(next_iter, 0) + 1
- 	# what is the directory?
- 	cur_dir = filechooser_widget.get_filename()
-+	# get_filename can return NoneType (for non-UTF8 directory)
-+	if not cur_dir:
-+	  return
-         # if recursive, we use walktree
- 	if recursive_widget.get_active():
- 	  # looping with walktree method
diff --git a/wallpapoz-0.5-gsettings.patch b/wallpapoz-0.5-gsettings.patch
deleted file mode 100644
index 0456657..0000000
--- a/wallpapoz-0.5-gsettings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py.gsettings	2011-05-05 18:13:34.000000000 +0900
-+++ wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py	2011-05-05 18:13:34.000000000 +0900
-@@ -171,6 +171,13 @@
-     os.system('gconftool-2 -t string -s /desktop/gnome/background/picture_filename ' + 
- 	'"' + wallpaper + '"' + ' -s /desktop/gnome/background/picture_options ' + 
- 	self.wallpaper_style)
-+    # And for gsettings
-+    status=os.system("which gsettings &>/dev/null")
-+    if status == 0:
-+        basecommand='gsettings set org.gnome.desktop.background '
-+        os.system(basecommand + 'picture-uri ' + "'\"" + 'file://' + wallpaper + "\"'")
-+        os.system(basecommand + 'picture-options ' + self.wallpaper_style)
-+        os.system(basecommand + 'draw-background true')
- 
-   ## class method to detect that we have changed workspace or not
-   def has_changed(self, previous_desktop, cur_desk):
---- wallpapoz-0.5/share/wallpapoz/lib/xml_processing.py.gsettings	2010-03-08 13:41:50.000000000 +0900
-+++ wallpapoz-0.5/share/wallpapoz/lib/xml_processing.py	2011-05-05 18:33:12.000000000 +0900
-@@ -57,7 +57,12 @@
-     self.config_file = home + "/.wallpapoz/wallpapoz.xml"
- 
-     # our current wallpaper
--    self.current_wallpaper = os.popen("gconftool-2 -g /desktop/gnome/background/picture_filename").read()[:-1]
-+    # First read from gsettings, then from gconf
-+    status=os.system("which gsettings &>/dev/null")
-+    if status == 0:
-+      self.current_wallpaper = os.popen("gsettings get org.gnome.desktop.background  picture-uri").read()[1:-2].replace("file://","")
-+    if self.current_wallpaper == '':
-+      self.current_wallpaper = os.popen("gconftool-2 -g /desktop/gnome/background/picture_filename").read()[:-1]
-     if self.current_wallpaper == '':
-       self.current_wallpaper = _("change this with picture file")
- 
diff --git a/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch b/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
deleted file mode 100644
index d6c5d95..0000000
--- a/wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wallpapoz-0.5/src/wallpapoz.workspace_num_incr	2011-05-31 23:12:48.000000000 +0900
-+++ wallpapoz-0.5/src/wallpapoz	2011-06-01 00:07:16.000000000 +0900
-@@ -723,12 +723,17 @@
-       # make the wallpaper list
-       wallpapoz_system = WallpapozSystem()
-       workspace_num = wallpapoz_system.get_total_workspaces()
-+      ii = 0
-       for i in range(workspace_num):
--	parent = self.store.append(None, [i+1, worklist[i].pop(0), True])
-+	if (ii >= len(worklist)):
-+         ii = 0 
-+	tmplist = list(worklist[ii])
-+	parent = self.store.append(None, [i+1, tmplist.pop(0), True])
- 	j = 1
--	for wallpaper in worklist[i]:
-+	for wallpaper in tmplist:
- 	  self.store.append(parent, [j, wallpaper, False])
- 	  j = j + 1
-+	ii = ii + 1
- 
-       # enable rename workspace menu
-       self.main_window.get_widget("rename_workspace").set_sensitive(True)
diff --git a/wallpapoz-0.4.1-rev92-animated-image.patch b/wallpapoz-0.6.1-animated-image.patch
similarity index 61%
rename from wallpapoz-0.4.1-rev92-animated-image.patch
rename to wallpapoz-0.6.1-animated-image.patch
index 3fc30d0..7690274 100644
--- a/wallpapoz-0.4.1-rev92-animated-image.patch
+++ b/wallpapoz-0.6.1-animated-image.patch
@@ -1,6 +1,6 @@
---- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.anime	2010-06-12 04:26:39.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-12 04:13:43.000000000 +0900
-@@ -1236,15 +1236,32 @@
+--- wallpapoz-0.6.1/src/wallpapoz.anime	2011-12-30 14:53:04.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:02:40.000000000 +0900
+@@ -1228,15 +1228,32 @@
      filename = self.store.get_value(position_iter, 1)
  
      # display image properly
@@ -9,19 +9,19 @@
 -      im = Image.open(filename)
 -      # keep image proportions
 -      if im.size[0] > im.size[1]:
--	self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
+-        self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
 +      anime = gtk.gdk.PixbufAnimation(filename)
 +
 +      if anime.is_static_image() :
 +        im = Image.open(filename)
 +        # keep image proportions
 +        if im.size[0] > im.size[1]:
-+	  self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
++          self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
 +        else:
-+	  self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
++          self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
 +
        else:
--	self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
+-        self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
 +        width = anime.get_width()
 +        height = anime.get_height()
 +        static_im = anime.get_static_image()
diff --git a/wallpapoz-0.6.1-delete-first-in-desktop-mode.patch b/wallpapoz-0.6.1-delete-first-in-desktop-mode.patch
new file mode 100644
index 0000000..7c348ee
--- /dev/null
+++ b/wallpapoz-0.6.1-delete-first-in-desktop-mode.patch
@@ -0,0 +1,18 @@
+--- wallpapoz-0.6.1/src/wallpapoz.deletefirst	2011-12-30 15:35:31.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:38:56.000000000 +0900
+@@ -1062,13 +1062,13 @@
+         lowest_iter = self.store.get_iter((path_iter-1,))
+       else:
+         index_temp = 0
++        before_path_iter = 0
+         for single_iter in self.selected_iter[1:]:
+           path_iter = self.store.get_path(single_iter)[0]
+           if path_iter == (index_temp + 1):
+             index_temp = index_temp + 1
+             before_path_iter = path_iter
+-          else:
+-            lowest_iter = self.store.get_iter((before_path_iter+1,))
++        lowest_iter = self.store.get_iter((before_path_iter+1,))
+ 
+       # remove the iter
+       for single_iter in self.selected_iter:
diff --git a/wallpapoz-0.6.1-delete-one-wallpaper.patch b/wallpapoz-0.6.1-delete-one-wallpaper.patch
new file mode 100644
index 0000000..ef2ffe3
--- /dev/null
+++ b/wallpapoz-0.6.1-delete-one-wallpaper.patch
@@ -0,0 +1,107 @@
+--- wallpapoz-0.6.1/src/wallpapoz.deletelastone	2011-12-30 15:20:41.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:29:05.000000000 +0900
+@@ -832,6 +832,16 @@
+     # list to put our lowest iter in every related workspace
+     lowest_iter_list = []
+ 
++    # FIXME
++    # FIXME
++    # Currently copy_iter_list can be NoneType, e.g. when
++    # - Select one wallpaper in a workspace
++    # - and delete it
++    # - next choose "Edit -> "Delete Wallpaperz""
++    # Well, bugish, however anyway workaround...
++    if not copy_iter_list:
++      return lowest_iter_list
++
+     # indication we have done with this workspace
+     done_workspace = True
+ 
+@@ -898,8 +908,16 @@
+     # do the remaining job, get the lowest iter from last workspace if we have not done withlast workspace
+     if not done_workspace:
+ 
+-      lowest_iter_list.append(
+-          self.store.get_iter( (parent_number_index, iter_workspace_index+1) ) )
++      # Umm... the original code raises ValueError if trying to delete
++      # a wallpaper from a workspace, if only one wallpaper existed.
++      # Need further investigation, however anyway workaround...
++      new_iter = []
++      try:
++        new_iter = self.store.get_iter((parent_number_index, iter_workspace_index + 1))
++      except ValueError:
++        pass
++      if new_iter:
++        lowest_iter_list.append(new_iter)
+ 
+     return lowest_iter_list
+ 
+@@ -975,6 +993,11 @@
+   def cut_and_reordering_treeiter(self):
+     lowest_iter_list = self.reordering_node_after_cut_and_paste( self.selected_iter )
+ 
++    # workaround for the case that trying to remove a wallpaper from
++    # the workspace where only one wallpaper exists
++    if not lowest_iter_list:
++	return
++
+     # iterate to cut ( really!!! ) the iter from selected iter list
+     for single_iter in self.selected_iter:
+ 
+@@ -985,6 +1008,9 @@
+     for single_iter in lowest_iter_list:
+       self.order_treeiter_from_lowest_iter(single_iter)
+ 
++    # Finally update selection view
++    self.treeview_selection_changed(None)
++
+   # order treeiter in one workspace or in list mode from lowest iter ( more efficient )
+   def order_treeiter_from_lowest_iter(self, single_iter):
+       # get the path
+@@ -1201,6 +1227,22 @@
+   # it display another image, and disable/enable some menu
+   def treeview_selection_changed(self, widget):
+     position_iter = self.get_selected_iter_of_treeview("anything")
++
++    if not position_iter:
++      # Nothing is selected, unfortunately this can happen
++      self.main_window.get_widget("rename_workspace").set_sensitive(False)
++      self.rename_workspace_menu.set_sensitive(False)
++      self.main_window.get_widget("change_wallpaper").set_sensitive(False)
++      self.change_wallpaper_menu.set_sensitive(False)
++      self.main_window.get_widget("cut").set_sensitive(False)
++      self.cut_menu.set_sensitive(False)
++      self.main_window.get_widget("copy").set_sensitive(False)
++      self.copy_menu.set_sensitive(False)
++      self.main_window.get_widget("delete_wallpapers").set_sensitive(False)
++      self.delete_wallpapers_menu.set_sensitive(False)
++      # Nothing left
++      return
++
+     if type(self.store) == gtk.TreeStore:
+       parent = self.store.iter_parent(position_iter)
+       # parent node, enable: rename_workspace
+@@ -1216,8 +1258,21 @@
+         self.cut_menu.set_sensitive(True)
+         self.main_window.get_widget("copy").set_sensitive(True)
+         self.copy_menu.set_sensitive(True)
+-        self.main_window.get_widget("delete_wallpapers").set_sensitive(True)
+-        self.delete_wallpapers_menu.set_sensitive(True)
++
++        # See create_configuration_file
++        # Check if there are at least 2 wallpapers
++        childiter = self.store.iter_children(parent)
++        childiter = self.store.iter_next(childiter)
++
++        # Only show "Delete wallpapers" menu if there are at least 2 wallpapers
++        # in a workspace
++        if childiter:
++          self.main_window.get_widget("delete_wallpapers").set_sensitive(True)
++          self.delete_wallpapers_menu.set_sensitive(True)
++        else:
++          self.main_window.get_widget("delete_wallpapers").set_sensitive(False)
++          self.delete_wallpapers_menu.set_sensitive(False)
++
+       # parent node
+       else:
+         self.main_window.get_widget("rename_workspace").set_sensitive(True)
diff --git a/wallpapoz-0.6.1-dircheck.patch b/wallpapoz-0.6.1-dircheck.patch
new file mode 100644
index 0000000..e9c53db
--- /dev/null
+++ b/wallpapoz-0.6.1-dircheck.patch
@@ -0,0 +1,84 @@
+--- wallpapoz-0.6.1/src/wallpapoz.dircheck	2011-07-24 00:54:43.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 14:28:16.000000000 +0900
+@@ -536,6 +536,9 @@
+         # if recursive, we use walktree
+         if recursive_widget.get_active():
+           # looping with walktree method
++          if not os.path.isdir(cur_dir):
++            return
++
+           for (basepath, children) in self.walktree(cur_dir,False):
+             for child in children:
+               # get the filename
+@@ -551,7 +554,11 @@
+         # if not just looping the directory with ordinary fashion
+         else:
+           # looping all files in this directory
+-          for file in os.listdir(cur_dir):
++          try:
++            dlist = os.listdir(cur_dir)
++          except OSError:
++            return
++          for file in dlist:
+             # get the filename
+             filename = os.path.join(cur_dir, file)
+             # we interested in file, not directory
+@@ -573,6 +580,9 @@
+         # if recursive, we use walktree
+         if recursive_widget.get_active():
+           # looping with walktree method
++          if not os.path.isdir(cur_dir):
++            return
++
+           for (basepath, children) in self.walktree(cur_dir,False):
+             for child in children:
+               # get the filename
+@@ -588,7 +598,11 @@
+         # if not, just looping with ordinary fashion
+         else:
+           # looping all files in this directory
+-          for file in os.listdir(cur_dir):
++          try:
++            ddir = os.listdir(cur_dir)
++          except OSError:
++            return
++          for file in ddir:
+             # get the filename
+             filename = os.path.join(cur_dir, file)
+             # we interested in file, not directory
+@@ -618,6 +632,9 @@
+       cur_dir = filechooser_widget.get_filename()
+       # if recursive, we use walktree
+       if recursive_widget.get_active():
++        if not os.path.isdir(cur_dir):
++          return
++
+         # looping with walktree method
+         for (basepath, children) in self.walktree(cur_dir,False):
+           for child in children:
+@@ -634,7 +651,11 @@
+       # if not recursive, just looping the directory with ordinary fashion
+       else:
+         # looping all files in this directory
+-        for file in os.listdir(cur_dir):
++        try:
++          dlist = os.listdir(cur_dir)
++        except OSError:
++          return
++        for file in dlist:
+           # get the filename
+           filename = os.path.join(cur_dir, file)
+           # we interested in file, not directory
+@@ -1210,7 +1231,11 @@
+ 
+   # helping method
+   def walktree (self, top = ".", depthfirst = True):
+-    names = os.listdir(top)
++    try:
++      names = os.listdir(top)
++    except OSError:
++      names = []
++      yield top, names
+     if not depthfirst:
+       yield top, names
+     for name in names:
diff --git a/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch b/wallpapoz-0.6.1-kill-daemon-without-x.patch
similarity index 53%
rename from wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
rename to wallpapoz-0.6.1-kill-daemon-without-x.patch
index 728aeea..8b6bb90 100644
--- a/wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
+++ b/wallpapoz-0.6.1-kill-daemon-without-x.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2011-11-28 18:16:13.959482838 +0900
-+++ wallpapoz-0.5/share/wallpapoz/lib/wallpapoz_system.py	2011-11-28 18:19:02.545376745 +0900
+--- wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2011-12-30 16:07:43.000000000 +0900
++++ wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py	2011-12-30 16:08:55.000000000 +0900
 @@ -24,9 +24,11 @@
  ## wallpapoz_system.py -- finds current desktop and changes wallpaper
  # achieve goal by calling external program
@@ -12,7 +12,7 @@
  
  class WallpapozSystem:
  
-@@ -59,12 +61,48 @@
+@@ -46,12 +48,48 @@
        print "daemon_wallpapoz: respawning daemon_wallpapoz."
        self.respawn_system()
  
@@ -62,39 +62,33 @@
      start_width = raw_resolution.find('Width')
      end_width = raw_resolution.find('\n',start_width)
      start_height = raw_resolution.find('Height')
-@@ -77,7 +115,7 @@
-     if self.beryl:
-       self.total_workspaces = self.row_workspaces * self.column_workspaces
-     else:
--      self.total_workspaces = int(os.popen("xprop -root _NET_NUMBER_OF_DESKTOPS").read()[36:38])
-+      self.total_workspaces = int(self.exec_cmd_under_X("xprop -root _NET_NUMBER_OF_DESKTOPS")[36:38])
+@@ -61,9 +99,9 @@
+ 
+   ## class method to find which desktop environment user uses
+   def finding_desktop_environment(self):
+-    raw_window_id = os.popen('xprop -root _NET_SUPPORTING_WM_CHECK').read()
++    raw_window_id = self.exec_cmd_under_X('xprop -root _NET_SUPPORTING_WM_CHECK')
+     window_id = raw_window_id[46:raw_window_id.find("\n")]
+-    raw_wm_name = os.popen('xprop -id ' + window_id + ' 8s _NET_WM_NAME').read()
++    raw_wm_name = self.exec_cmd_under_X('xprop -id ' + window_id + ' 8s _NET_WM_NAME')
+     wm_name = raw_wm_name[29:raw_wm_name.rfind('"')]
+     if wm_name=='Xfwm4':
+       self.window_manager = 'XFCE4'
+@@ -79,7 +117,7 @@
+ 
+   ## class method to find amount of workspaces in user desktop
+   def finding_total_workspaces(self):
+-    self.total_workspaces = int(os.popen("xprop -root _NET_NUMBER_OF_DESKTOPS").read()[36:38])
++    self.total_workspaces = int(self.exec_cmd_under_X("xprop -root _NET_NUMBER_OF_DESKTOPS")[36:38])
  
      # Save this total_workspaces value
      if not WallpapozSystem.static_finding_total_workspaces_called_p:
-@@ -86,7 +124,7 @@
+@@ -97,7 +135,7 @@
  
-   ## class method to find if user use beryl in his system or not
-   def check_beryl(self):
--    raw_geometry = os.popen('xprop -root _NET_DESKTOP_GEOMETRY').read()
-+    raw_geometry = self.exec_cmd_under_X('xprop -root _NET_DESKTOP_GEOMETRY')
-     # output of xprop -root _NET_DESKTOP_GEOMETRY is '_NET_DESKTOP_GEOMETRY(CARDINAL) = 1024, 768\n'
-     # and we just need the '1024, 768' part
-     raw_geometry = raw_geometry[34:raw_geometry.find('\n')]
-@@ -117,7 +155,7 @@
    ## class method to know what workspace we are in now
    def current_desktop(self):
-     if self.beryl:
--      raw_viewport = os.popen('xprop -root _NET_DESKTOP_VIEWPORT').read()
-+      raw_viewport = self.exec_cmd_under_X('xprop -root _NET_DESKTOP_VIEWPORT')
-       # output of xprop -root _NET_DESKTOP_VIEWPORT is '_NET_DESKTOP_VIEWPORT(CARDINAL) = 1024, 768\n'
-       # and we just need the '1024, 768' part
-       raw_viewport = raw_viewport[34:raw_viewport.find('\n')]
-@@ -126,7 +164,7 @@
-       y_pos = int(viewport[1]) / self.screen_height
-       workspace = x_pos + self.column_workspaces * y_pos
-     else:
--      raw_workspace = os.popen('xprop -root _NET_CURRENT_DESKTOP').read()
-+      raw_workspace = self.exec_cmd_under_X('xprop -root _NET_CURRENT_DESKTOP')
-       workspace = int(raw_workspace[33] + raw_workspace[34])
+-    raw_workspace = os.popen('xprop -root _NET_CURRENT_DESKTOP').read()
++    raw_workspace = self.exec_cmd_under_X('xprop -root _NET_CURRENT_DESKTOP')
+     workspace = int(raw_workspace[33] + raw_workspace[34])
      return workspace
  
diff --git a/wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch b/wallpapoz-0.6.1-kill-multiple-daemon.patch
similarity index 50%
rename from wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch
rename to wallpapoz-0.6.1-kill-multiple-daemon.patch
index eaa4f7e..a602b91 100644
--- a/wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch
+++ b/wallpapoz-0.6.1-kill-multiple-daemon.patch
@@ -1,6 +1,6 @@
---- wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py.kill_multi	2010-03-18 01:01:50.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/share/wallpapoz/lib/wallpapoz_system.py	2010-03-18 01:03:38.000000000 +0900
-@@ -189,3 +189,17 @@
+--- wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py.kill_multi	2011-12-30 14:49:25.000000000 +0900
++++ wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py	2011-12-30 14:49:25.000000000 +0900
+@@ -180,3 +180,17 @@
      print "os.execvp failed, exiting..."
      sys.exit(1)
  
@@ -18,16 +18,15 @@
 +      if ( id_list in python_id_list ) and ( int(id_list) != cpid) :
 +        os.kill(int(id_list), signal.SIGTERM)
 +
---- wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz.kill_multi	2010-03-18 01:01:50.000000000 +0900
-+++ wallpapoz-0.4.1-svn92_trunk/src/daemon_wallpapoz	2010-03-18 01:01:50.000000000 +0900
-@@ -98,6 +98,10 @@
-   # create the system class ( to change wallpaper and read current desktop )
+--- wallpapoz-0.6.1/src/daemon_wallpapoz.kill_multi	2011-12-30 14:49:25.000000000 +0900
++++ wallpapoz-0.6.1/src/daemon_wallpapoz	2011-12-30 14:52:08.000000000 +0900
+@@ -99,6 +99,9 @@
    # by calling external program
    wallpapoz_system = WallpapozSystem()
-+
+ 
 +  # Kill other daemon_wallpapoz if running
 +  wallpapoz_system.prevent_multiple_start()
 +
-   available_style = { '3' : 'zoom', '2' : 'scaled', '1' : 'stretched', 
-       '0' : 'centered', '4' : 'wallpaper' } 
-   style = available_style[wallpapozxml.style()]
+   # type of window manager (gnome or xfce)
+   window_manager = wallpapoz_system.window_manager
+ 
diff --git a/wallpapoz-0.6.1-nonutf8-directory.patch b/wallpapoz-0.6.1-nonutf8-directory.patch
new file mode 100644
index 0000000..8de1d75
--- /dev/null
+++ b/wallpapoz-0.6.1-nonutf8-directory.patch
@@ -0,0 +1,22 @@
+--- wallpapoz-0.6.1/src/wallpapoz.nonutf8	2011-12-30 15:13:57.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:19:28.000000000 +0900
+@@ -542,6 +542,9 @@
+         num_of_child = self.store.iter_n_children(iter)
+         # what is the directory?
+         cur_dir = filechooser_widget.get_filename()
++        # get_filename can return NoneType (for non-UTF8 directory)
++        if not cur_dir:
++          return
+         # if recursive, we use walktree
+         if recursive_widget.get_active():
+           # looping with walktree method
+@@ -586,6 +589,9 @@
+         new_index = self.store.get_value(next_iter, 0) + 1
+         # what is the directory?
+         cur_dir = filechooser_widget.get_filename()
++        # get_filename can return NoneType (for non-UTF8 directory)
++        if not cur_dir:
++          return
+         # if recursive, we use walktree
+         if recursive_widget.get_active():
+           # looping with walktree method
diff --git a/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch b/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
new file mode 100644
index 0000000..eebff92
--- /dev/null
+++ b/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
@@ -0,0 +1,21 @@
+--- wallpapoz-0.6.1/src/wallpapoz.workspace_num_incr	2011-12-30 15:45:29.000000000 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:48:47.000000000 +0900
+@@ -722,12 +722,17 @@
+       # make the wallpaper list
+       wallpapoz_system = WallpapozSystem()
+       workspace_num = wallpapoz_system.get_total_workspaces()
++      ii = 0
+       for i in range(workspace_num):
+-        parent = self.store.append(None, [i+1, worklist[i].pop(0), True])
++        if (ii >= len(worklist)):
++          ii = 0 
++        tmplist = list(worklist[ii])
++        parent = self.store.append(None, [i+1, tmplist.pop(0), True])
+         j = 1
+         for wallpaper in worklist[i]:
+           self.store.append(parent, [j, wallpaper, False])
+           j = j + 1
++        ii = ii + 1
+ 
+       # enable rename workspace menu
+       self.main_window.get_widget("rename_workspace").set_sensitive(True)
diff --git a/wallpapoz-0.6.1-workspace-num-respawn.patch b/wallpapoz-0.6.1-workspace-num-respawn.patch
new file mode 100644
index 0000000..5b16c20
--- /dev/null
+++ b/wallpapoz-0.6.1-workspace-num-respawn.patch
@@ -0,0 +1,74 @@
+--- wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py.respawn	2011-10-16 23:40:03.000000000 +0900
++++ wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py	2011-12-30 16:07:01.000000000 +0900
+@@ -25,15 +25,27 @@
+ # achieve goal by calling external program
+ 
+ import os
++import sys
+ import string
+ 
+ class WallpapozSystem:
+ 
++  # Define static variable to save the initial value of
++  # workspaces
++  static_finding_total_workspaces_called_p = False
++  static_total_workspaces = 0
++
+   def __init__(self):
+     self.finding_screen_resolution()
+     self.finding_total_workspaces()
+     self.finding_desktop_environment()
+ 
++    # Check if total_workspaces changed only here
++    if WallpapozSystem.static_total_workspaces != self.total_workspaces:
++      print "daemon_wallpapoz: the number of total workspaces changed during initialization process."
++      print "daemon_wallpapoz: respawning daemon_wallpapoz."
++      self.respawn_system()
++
+   def set_style(self, style):
+     self.wallpaper_style = style
+ 
+@@ -69,6 +81,11 @@
+   def finding_total_workspaces(self):
+     self.total_workspaces = int(os.popen("xprop -root _NET_NUMBER_OF_DESKTOPS").read()[36:38])
+ 
++    # Save this total_workspaces value
++    if not WallpapozSystem.static_finding_total_workspaces_called_p:
++      WallpapozSystem.static_finding_total_workspaces_called = True
++      WallpapozSystem.static_total_workspaces = self.total_workspaces
++
+   ## class method to find how many rows and columns of workspaces
+   def finding_row_and_column(self):
+     self.row_workspaces = self.geometry_height / self.screen_height
+@@ -117,3 +134,11 @@
+       return True
+     else:
+       return False
++
++  def respawn_system(self):
++    new_argv = []
++    new_argv.extend(sys.argv)
++    os.execvp('daemon_wallpapoz', new_argv)
++    print "os.execvp failed, exiting..."
++    sys.exit(1)
++
+--- wallpapoz-0.6.1/src/daemon_wallpapoz.respawn	2011-07-24 00:54:43.000000000 +0900
++++ wallpapoz-0.6.1/src/daemon_wallpapoz	2011-12-30 16:06:07.000000000 +0900
+@@ -145,11 +145,16 @@
+     if wallpapozxml.get_type() == "workspace":
+       while True:
+         # don't get rush
+-        time.sleep(1)
++        # sleep a bit more
++        time.sleep(2)
+ 
+         # what workspace we are in now?
+         cur_desk = wallpapoz_system.current_desktop()
+ 
++        if cur_desk >= wallpapoz_system.get_total_workspaces():
++            # ignore
++            continue
++
+         # requirement for changing wallpaper
+         # 1. we change workspace
+         # 2. index of wallpaper list change
diff --git a/wallpapoz.spec b/wallpapoz.spec
index eaf1cc9..b52127d 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -5,10 +5,10 @@
 %define         srcurl          http://wallpapoz.akbarhome.com/
 %define         icondir         %{_datadir}/icons/hicolor/128x128/apps
 
-%define         mainver         0.5
+%define         mainver         0.6.1
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      10
+%define         fedorarel      1
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -19,8 +19,8 @@ Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            %{srcurl}
-Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+URL:            http://vajrasky.wordpress.com/wallpapoz/
+Source0:        https://github.com/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
 %if 0%{?fedora} >= 12
 Source11:       wallpapoz-autostart.desktop
 %endif
@@ -30,10 +30,10 @@ Source11:       wallpapoz-autostart.desktop
 Source12:	daemon_wallpapoz-wrapper
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
-Patch0:         wallpapoz-0.4.1-rev92-compiz-respawn.patch
+Patch0:         wallpapoz-0.6.1-workspace-num-respawn.patch
 # Check if selected item is really a directory when adding directory
 # bug 549219
-Patch2:         wallpapoz-0.4.1-rev92-dircheck.patch
+Patch2:         wallpapoz-0.6.1-dircheck.patch
 # Avoid backtrace in case no item is selected yet (bug 555181)
 Patch3:         wallpapoz-0.4.1-rev92-noitem_selected.patch
 # Intialization for pasting selected items
@@ -42,32 +42,32 @@ Patch4:         wallpapoz-0.4.1-rev92-paste-initialization.patch
 # bug 531343, 538533, 541434, 556377, 569135, 571827
 # (and bug 566594)
 # (and bug 711541)
-Patch5:         wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
+Patch5:         wallpapoz-0.6.1-kill-daemon-without-x.patch
 # Kill other daemon_wallpapoz if running
-Patch6:         wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch
+Patch6:         wallpapoz-0.6.1-kill-multiple-daemon.patch
 # Make wallpapoz gui handle animated image file
 # bug 602921
-Patch7:		wallpapoz-0.4.1-rev92-animated-image.patch
+Patch7:		wallpapoz-0.6.1-animated-image.patch
 # Non-utf8 directory can return NoneType with filechooser_widget.get_filename
 # bug 603351
-Patch8:		wallpapoz-0.4.1-rev92-nonutf8-directory.patch
+Patch8:		wallpapoz-0.6.1-nonutf8-directory.patch
 # Don't remove a wallpaper from a workspace if there is only one
 # wallpaper left.
 # bug 567136
 # Also some fixes about gtk menu sensitive issue (after doing some movement
 # for wallpapers)
-Patch9:		wallpapoz-0.4.1-rev92-delete-one-wallpaper.patch
+Patch9:		wallpapoz-0.6.1-delete-one-wallpaper.patch
 # Fix backtrace when deleting first element in desktop (not workspace) mode
 # bug 597959
-Patch10:	wallpapoz-0.4.1-rev92-delete-first-in-desktop-mode.patch
-# Port to gsettins
-Patch11:	wallpapoz-0.5-gsettings.patch
+Patch10:	wallpapoz-0.6.1-delete-first-in-desktop-mode.patch
+# Port to gsettings
+#Patch11:	wallpapoz-0.5-gsettings.patch
 # At startup, wallpapoz will try to show workspace name as "images"
 Patch12:	wallpapoz-0.5-startup-warn-about-workspace-name.patch
 # Fix backtrace when switching from desktop style XML to workspace style one
 # with workspace number increased
 # bug 708769
-Patch13:	wallpapoz-0.5-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
+Patch13:	wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
 
 BuildArch:      noarch
 
@@ -96,7 +96,7 @@ wallpapers for different workspaces or virtual desktops.
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-%patch0 -p1 -b .compiz
+%patch0 -p1 -b .respawn
 %patch2 -p1 -b .dircheck
 %patch3 -p1 -b .noitem
 %patch4 -p1 -b .patch_init
@@ -107,7 +107,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch9 -p1 -b .deletelastone
 %patch10 -p1 -b .deletefirst
 %if 0%{?fedora} >= 15
-%patch11 -p1 -b .gsettings
+#%%patch11 -p1 -b .gsettings
 %endif
 %patch12 -p1 -b .workspace_img
 %patch13 -p1 -b .workspace_num_incr
@@ -156,6 +156,9 @@ pushd ${RPM_BUILD_ROOT}
 %{__mv} ./%{_bindir}/daemon_wallpapoz ./%{_libexecdir}
 %{__install} -cp -m 0755 %{SOURCE12} ./%{_bindir}/daemon_wallpapoz
 popd
+# And as we use out custom wrapper script, the following
+# is not needed
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 
 %{find_lang} %{name}
 
@@ -179,6 +182,9 @@ popd
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Dec 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Fri Dec 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.5-10
 - Forgot to apply patch13...
 

From 6debf9f5a3a4a1553c46cefcab21271b5aa6354e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 02:08:38 -0600
Subject: [PATCH 05/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index b52127d..ec5c0fb 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -182,6 +182,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri Dec 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 

From 614cb1233ded7e61d13f3e09dcf1114003101724 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Wed, 18 Jan 2012 10:15:37 +0900
Subject: [PATCH 06/57] Fix error on Patch13 which causes unneeded entry to
 show up in wallpapoz GUI

---
 ...rom-wallpaper-to-desktop-with-workspace-increase.patch | 7 ++++---
 wallpapoz.spec                                            | 8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch b/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
index eebff92..e2ab0d7 100644
--- a/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
+++ b/wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increase.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.6.1/src/wallpapoz.workspace_num_incr	2011-12-30 15:45:29.000000000 +0900
-+++ wallpapoz-0.6.1/src/wallpapoz	2011-12-30 15:48:47.000000000 +0900
+--- wallpapoz-0.6.1/src/wallpapoz.workspace_num_incr	2012-01-18 10:05:16.361577377 +0900
++++ wallpapoz-0.6.1/src/wallpapoz	2012-01-18 10:09:45.651470988 +0900
 @@ -722,12 +722,17 @@
        # make the wallpaper list
        wallpapoz_system = WallpapozSystem()
@@ -12,7 +12,8 @@
 +        tmplist = list(worklist[ii])
 +        parent = self.store.append(None, [i+1, tmplist.pop(0), True])
          j = 1
-         for wallpaper in worklist[i]:
+-        for wallpaper in worklist[i]:
++        for wallpaper in tmplist:
            self.store.append(parent, [j, wallpaper, False])
            j = j + 1
 +        ii = ii + 1
diff --git a/wallpapoz.spec b/wallpapoz.spec
index ec5c0fb..ff8e047 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.1
 %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
@@ -182,6 +182,10 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jan 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.1-2
+- Fix error on Patch13 which causes unneeded entry to show up
+  in wallpapoz GUI
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From fa5c9a229d890da052a060af78512d924035825d Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 6 Mar 2012 14:07:25 +0900
Subject: [PATCH 07/57] 0.6.2

---
 .gitignore                                           |  1 +
 sources                                              |  2 +-
 ...ch => wallpapoz-0.6.2-kill-daemon-without-x.patch | 12 ++++++------
 wallpapoz.spec                                       | 11 +++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)
 rename wallpapoz-0.6.1-kill-daemon-without-x.patch => wallpapoz-0.6.2-kill-daemon-without-x.patch (91%)

diff --git a/.gitignore b/.gitignore
index 8e8ed4e..e26b6ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 wallpapoz-0.4.1-svn92_trunk.tar.bz2
 /wallpapoz-0.5.tar.bz2
 /wallpapoz-0.6.1.tar.bz2
+/wallpapoz-0.6.2.tar.bz2
diff --git a/sources b/sources
index cd74978..f8b4dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e89f1988af6eb70a8bee0cb3a36bd854  wallpapoz-0.6.1.tar.bz2
+15f052342281eb587bba98c7d6999ce9  wallpapoz-0.6.2.tar.bz2
diff --git a/wallpapoz-0.6.1-kill-daemon-without-x.patch b/wallpapoz-0.6.2-kill-daemon-without-x.patch
similarity index 91%
rename from wallpapoz-0.6.1-kill-daemon-without-x.patch
rename to wallpapoz-0.6.2-kill-daemon-without-x.patch
index 8b6bb90..38eb35f 100644
--- a/wallpapoz-0.6.1-kill-daemon-without-x.patch
+++ b/wallpapoz-0.6.2-kill-daemon-without-x.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2011-12-30 16:07:43.000000000 +0900
-+++ wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py	2011-12-30 16:08:55.000000000 +0900
+--- wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2012-03-06 11:59:53.171834985 +0900
++++ wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py	2012-03-06 14:02:32.087891881 +0900
 @@ -24,9 +24,11 @@
  ## wallpapoz_system.py -- finds current desktop and changes wallpaper
  # achieve goal by calling external program
@@ -72,9 +72,9 @@
 -    raw_wm_name = os.popen('xprop -id ' + window_id + ' 8s _NET_WM_NAME').read()
 +    raw_wm_name = self.exec_cmd_under_X('xprop -id ' + window_id + ' 8s _NET_WM_NAME')
      wm_name = raw_wm_name[29:raw_wm_name.rfind('"')]
-     if wm_name=='Xfwm4':
-       self.window_manager = 'XFCE4'
-@@ -79,7 +117,7 @@
+     # default is Gnome3.
+     self.window_manager = 'Gnome3'
+@@ -80,7 +118,7 @@
  
    ## class method to find amount of workspaces in user desktop
    def finding_total_workspaces(self):
@@ -83,7 +83,7 @@
  
      # Save this total_workspaces value
      if not WallpapozSystem.static_finding_total_workspaces_called_p:
-@@ -97,7 +135,7 @@
+@@ -98,7 +136,7 @@
  
    ## class method to know what workspace we are in now
    def current_desktop(self):
diff --git a/wallpapoz.spec b/wallpapoz.spec
index ff8e047..d5edf12 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -5,10 +5,10 @@
 %define         srcurl          http://wallpapoz.akbarhome.com/
 %define         icondir         %{_datadir}/icons/hicolor/128x128/apps
 
-%define         mainver         0.6.1
+%define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      2
+%define         fedorarel      1
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -20,7 +20,7 @@ Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://vajrasky.wordpress.com/wallpapoz/
-Source0:        https://github.com/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
 %if 0%{?fedora} >= 12
 Source11:       wallpapoz-autostart.desktop
 %endif
@@ -42,7 +42,7 @@ Patch4:         wallpapoz-0.4.1-rev92-paste-initialization.patch
 # bug 531343, 538533, 541434, 556377, 569135, 571827
 # (and bug 566594)
 # (and bug 711541)
-Patch5:         wallpapoz-0.6.1-kill-daemon-without-x.patch
+Patch5:         wallpapoz-0.6.2-kill-daemon-without-x.patch
 # Kill other daemon_wallpapoz if running
 Patch6:         wallpapoz-0.6.1-kill-multiple-daemon.patch
 # Make wallpapoz gui handle animated image file
@@ -182,6 +182,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Mar  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.2-1
+- 0.6.2
+
 * Wed Jan 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.1-2
 - Fix error on Patch13 which causes unneeded entry to show up
   in wallpapoz GUI

From 055c9b686861062a802a0c2811f4f2a6fc5e83d9 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 6 Mar 2012 14:07:36 +0900
Subject: [PATCH 08/57] 0.6.2

---
 .gitignore                                           |  1 +
 sources                                              |  2 +-
 ...ch => wallpapoz-0.6.2-kill-daemon-without-x.patch | 12 ++++++------
 wallpapoz.spec                                       | 11 +++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)
 rename wallpapoz-0.6.1-kill-daemon-without-x.patch => wallpapoz-0.6.2-kill-daemon-without-x.patch (91%)

diff --git a/.gitignore b/.gitignore
index 8e8ed4e..e26b6ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 wallpapoz-0.4.1-svn92_trunk.tar.bz2
 /wallpapoz-0.5.tar.bz2
 /wallpapoz-0.6.1.tar.bz2
+/wallpapoz-0.6.2.tar.bz2
diff --git a/sources b/sources
index cd74978..f8b4dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e89f1988af6eb70a8bee0cb3a36bd854  wallpapoz-0.6.1.tar.bz2
+15f052342281eb587bba98c7d6999ce9  wallpapoz-0.6.2.tar.bz2
diff --git a/wallpapoz-0.6.1-kill-daemon-without-x.patch b/wallpapoz-0.6.2-kill-daemon-without-x.patch
similarity index 91%
rename from wallpapoz-0.6.1-kill-daemon-without-x.patch
rename to wallpapoz-0.6.2-kill-daemon-without-x.patch
index 8b6bb90..38eb35f 100644
--- a/wallpapoz-0.6.1-kill-daemon-without-x.patch
+++ b/wallpapoz-0.6.2-kill-daemon-without-x.patch
@@ -1,5 +1,5 @@
---- wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2011-12-30 16:07:43.000000000 +0900
-+++ wallpapoz-0.6.1/share/wallpapoz/lib/wallpapoz_system.py	2011-12-30 16:08:55.000000000 +0900
+--- wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py.kill_nox	2012-03-06 11:59:53.171834985 +0900
++++ wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py	2012-03-06 14:02:32.087891881 +0900
 @@ -24,9 +24,11 @@
  ## wallpapoz_system.py -- finds current desktop and changes wallpaper
  # achieve goal by calling external program
@@ -72,9 +72,9 @@
 -    raw_wm_name = os.popen('xprop -id ' + window_id + ' 8s _NET_WM_NAME').read()
 +    raw_wm_name = self.exec_cmd_under_X('xprop -id ' + window_id + ' 8s _NET_WM_NAME')
      wm_name = raw_wm_name[29:raw_wm_name.rfind('"')]
-     if wm_name=='Xfwm4':
-       self.window_manager = 'XFCE4'
-@@ -79,7 +117,7 @@
+     # default is Gnome3.
+     self.window_manager = 'Gnome3'
+@@ -80,7 +118,7 @@
  
    ## class method to find amount of workspaces in user desktop
    def finding_total_workspaces(self):
@@ -83,7 +83,7 @@
  
      # Save this total_workspaces value
      if not WallpapozSystem.static_finding_total_workspaces_called_p:
-@@ -97,7 +135,7 @@
+@@ -98,7 +136,7 @@
  
    ## class method to know what workspace we are in now
    def current_desktop(self):
diff --git a/wallpapoz.spec b/wallpapoz.spec
index ff8e047..d5edf12 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -5,10 +5,10 @@
 %define         srcurl          http://wallpapoz.akbarhome.com/
 %define         icondir         %{_datadir}/icons/hicolor/128x128/apps
 
-%define         mainver         0.6.1
+%define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      2
+%define         fedorarel      1
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -20,7 +20,7 @@ Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://vajrasky.wordpress.com/wallpapoz/
-Source0:        https://github.com/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
 %if 0%{?fedora} >= 12
 Source11:       wallpapoz-autostart.desktop
 %endif
@@ -42,7 +42,7 @@ Patch4:         wallpapoz-0.4.1-rev92-paste-initialization.patch
 # bug 531343, 538533, 541434, 556377, 569135, 571827
 # (and bug 566594)
 # (and bug 711541)
-Patch5:         wallpapoz-0.6.1-kill-daemon-without-x.patch
+Patch5:         wallpapoz-0.6.2-kill-daemon-without-x.patch
 # Kill other daemon_wallpapoz if running
 Patch6:         wallpapoz-0.6.1-kill-multiple-daemon.patch
 # Make wallpapoz gui handle animated image file
@@ -182,6 +182,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Mar  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.2-1
+- 0.6.2
+
 * Wed Jan 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.1-2
 - Fix error on Patch13 which causes unneeded entry to show up
   in wallpapoz GUI

From ca1c6faa342f2c8301f27eb7b86490d4aa873670 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 21 Jul 2012 22:11:32 -0500
Subject: [PATCH 09/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index d5edf12..2508bd1 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -182,6 +182,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue Mar  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.2-1
 - 0.6.2
 

From b159bff0f9cd124987248bd28b1751500aaf0dcc Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 18 Sep 2012 12:48:41 +0900
Subject: [PATCH 10/57] 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(-)
 create mode 100644 wallpapoz-0.6.2-wm-return-to-default.patch

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@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@lists.fedoraproject.org> - 0.6.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 78dc2e39d4a2bc42101572ad56092cd4331ff8c6 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 18 Sep 2012 12:48:53 +0900
Subject: [PATCH 11/57] 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(-)
 create mode 100644 wallpapoz-0.6.2-wm-return-to-default.patch

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@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@lists.fedoraproject.org> - 0.6.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 94331d793d2ef25aa4584f8acbf5a9423d6fea9f Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 18 Sep 2012 12:49:03 +0900
Subject: [PATCH 12/57] 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                             | 16 ++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 wallpapoz-0.6.2-wm-return-to-default.patch

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 d5edf12..ff5dbfe 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %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}
 
@@ -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,13 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Sep 18 2012 Mamoru Tasaka <mtasaka@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@lists.fedoraproject.org> - 0.6.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue Mar  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.2-1
 - 0.6.2
 

From 3f6c643334ae4630ec29f30244f8f920a44f31d9 Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Tue, 15 Jan 2013 18:21:09 +0900
Subject: [PATCH 13/57] Don't import Image directly and import PIL instead for

  F-19 Pillow conversion
  Patch from Stephen Gallagher <sgallagh@redhat.com>
  (bug 895217)
---
 wallpapoz-0.6.2-import-PIL-for-Image.patch | 132 +++++++++++++++++++++
 wallpapoz.spec                             |  13 +-
 2 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 wallpapoz-0.6.2-import-PIL-for-Image.patch

diff --git a/wallpapoz-0.6.2-import-PIL-for-Image.patch b/wallpapoz-0.6.2-import-PIL-for-Image.patch
new file mode 100644
index 0000000..cab327b
--- /dev/null
+++ b/wallpapoz-0.6.2-import-PIL-for-Image.patch
@@ -0,0 +1,132 @@
+diff -ruN wallpapoz-0.6.2.orig/setup.py wallpapoz-0.6.2/setup.py
+--- wallpapoz-0.6.2.orig/setup.py	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/setup.py	2013-01-14 15:57:08.902128603 -0500
+@@ -123,7 +123,7 @@
+       print "    !!! Python Glade ............. ", _("Not found")
+       required_found = False
+   try:
+-    import Image
++    from PIL import Image
+     print "    Python Imaging Library ....... OK"
+   except ImportError:
+     print "    !!! Python Imaging Library ... ", _("Not found")
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz wallpapoz-0.6.2/src/wallpapoz
+--- wallpapoz-0.6.2.orig/src/wallpapoz	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz	2013-01-14 16:00:16.960947005 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.anime wallpapoz-0.6.2/src/wallpapoz.anime
+--- wallpapoz-0.6.2.orig/src/wallpapoz.anime	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.anime	2013-01-14 15:58:53.632027371 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.deletefirst wallpapoz-0.6.2/src/wallpapoz.deletefirst
+--- wallpapoz-0.6.2.orig/src/wallpapoz.deletefirst	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.deletefirst	2013-01-14 15:59:32.240990119 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.deletelastone wallpapoz-0.6.2/src/wallpapoz.deletelastone
+--- wallpapoz-0.6.2.orig/src/wallpapoz.deletelastone	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.deletelastone	2013-01-14 15:59:20.417001528 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.dircheck wallpapoz-0.6.2/src/wallpapoz.dircheck
+--- wallpapoz-0.6.2.orig/src/wallpapoz.dircheck	2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.dircheck	2013-01-14 15:57:32.238106009 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.noitem wallpapoz-0.6.2/src/wallpapoz.noitem
+--- wallpapoz-0.6.2.orig/src/wallpapoz.noitem	2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.noitem	2013-01-14 15:57:47.354091394 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.nonutf8 wallpapoz-0.6.2/src/wallpapoz.nonutf8
+--- wallpapoz-0.6.2.orig/src/wallpapoz.nonutf8	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.nonutf8	2013-01-14 15:59:04.928016478 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.patch_init wallpapoz-0.6.2/src/wallpapoz.patch_init
+--- wallpapoz-0.6.2.orig/src/wallpapoz.patch_init	2013-01-14 15:56:24.057172107 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.patch_init	2013-01-14 15:58:33.808046499 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.workspace_img wallpapoz-0.6.2/src/wallpapoz.workspace_img
+--- wallpapoz-0.6.2.orig/src/wallpapoz.workspace_img	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.workspace_img	2013-01-14 15:59:54.968968202 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
+diff -ruN wallpapoz-0.6.2.orig/src/wallpapoz.workspace_num_incr wallpapoz-0.6.2/src/wallpapoz.workspace_num_incr
+--- wallpapoz-0.6.2.orig/src/wallpapoz.workspace_num_incr	2013-01-14 15:56:24.058172106 -0500
++++ wallpapoz-0.6.2/src/wallpapoz.workspace_num_incr	2013-01-14 16:00:08.673954992 -0500
+@@ -35,7 +35,7 @@
+ import sys
+ import stat
+ import gettext
+-import Image
++from PIL import Image
+ 
+ try:
+   import gnome
diff --git a/wallpapoz.spec b/wallpapoz.spec
index ff5dbfe..7a9a1ad 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      2
+%define         fedorarel      3
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -71,6 +71,10 @@ Patch13:	wallpapoz-0.6.1-switch-from-wallpaper-to-desktop-with-workspace-increas
 # 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
+# Don't import Image directory and import PIL instead for
+# F-19 Pillow conversion
+# (bug 895217)
+Patch15:	wallpapoz-0.6.2-import-PIL-for-Image.patch
 
 BuildArch:      noarch
 
@@ -112,6 +116,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch12 -p1 -b .workspace_img
 %patch13 -p1 -b .workspace_num_incr
 %patch14 -p1 -b .default
+%patch15 -p1 -b .pil
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -183,6 +188,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Jan 15 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-3
+- Don't import Image directly and import PIL instead for
+  F-19 Pillow conversion
+  Patch from Stephen Gallagher <sgallagh@redhat.com>
+  (bug 895217)
+
 * Tue Sep 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.6.2-2
 - Return to set default WM to GNOME3 when proper WM is not found
   (bug 857587)

From f7d96ee091b090d9094e82df316276b86e782d7d Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Sat, 19 Jan 2013 22:33:49 +0900
Subject: [PATCH 14/57] Support LXDE

---
 wallpapoz-0.6.2-LXDE.patch | 47 ++++++++++++++++++++++++++++++++++++++
 wallpapoz.spec             |  8 ++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 wallpapoz-0.6.2-LXDE.patch

diff --git a/wallpapoz-0.6.2-LXDE.patch b/wallpapoz-0.6.2-LXDE.patch
new file mode 100644
index 0000000..7b42b44
--- /dev/null
+++ b/wallpapoz-0.6.2-LXDE.patch
@@ -0,0 +1,47 @@
+--- wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py.LXDE	2013-01-19 21:34:04.000000000 +0900
++++ wallpapoz-0.6.2/share/wallpapoz/lib/wallpapoz_system.py	2013-01-19 22:10:23.000000000 +0900
+@@ -105,6 +105,14 @@
+     wm_name = raw_wm_name[29:raw_wm_name.rfind('"')]
+     # default is Gnome3.
+     self.window_manager = 'Gnome3'
++    if wm_name == 'Openbox':
++      try:
++        env = os.environ['XDG_CURRENT_DESKTOP']
++        if env == 'LXDE':
++          self.window_manager = 'LXDE'
++          return
++      except:
++        pass
+     if wm_name=='Xfwm4':
+       self.window_manager = 'XFCE4'
+     else:
+@@ -158,6 +166,9 @@
+         '"' + wallpaper + '"')
+       os.system("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-style -s " +
+         self.wallpaper_style)
++    elif self.window_manager == "LXDE":
++      os.system("pcmanfm -w " + wallpaper)
++      os.system("pcmanfm --wallpaper-mode=" + self.wallpaper_style)
+ 
+   ## class method to find current desktop wallpaper
+   def finding_current_wallpaper(self):
+@@ -167,6 +178,8 @@
+       return os.popen("gsettings get org.gnome.desktop.background picture-uri").read()[8:-2]
+     elif self.window_manager == "XFCE4":
+       return os.popen("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path").read()[:-1]
++    else:
++      return ""
+ 
+   ## class method to detect that we have changed workspace or not
+   def has_changed(self, previous_desktop, cur_desk):
+--- wallpapoz-0.6.2/src/daemon_wallpapoz.LXDE	2013-01-19 21:34:04.000000000 +0900
++++ wallpapoz-0.6.2/src/daemon_wallpapoz	2013-01-19 22:15:01.000000000 +0900
+@@ -114,6 +114,8 @@
+   available_style['Gnome3'] = available_style['Gnome']
+   available_style['XFCE4'] = { '3' : '5', '2' : '4', '1' : '3', '0' : '1',
+           '4' : '2' }
++  available_style['LXDE'] = {'0': 'center', '1' : 'stretch', '2' : 'fit',
++           '3': 'fit', '4': 'tile'}
+   style = available_style[window_manager][wallpapozxml.style()]
+   wallpapoz_system.set_style(style)
+ 
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 7a9a1ad..4860005 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      3
+%define         fedorarel      4
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -75,6 +75,8 @@ Patch14:	wallpapoz-0.6.2-wm-return-to-default.patch
 # F-19 Pillow conversion
 # (bug 895217)
 Patch15:	wallpapoz-0.6.2-import-PIL-for-Image.patch
+# Support LXDE
+Patch16:	wallpapoz-0.6.2-LXDE.patch
 
 BuildArch:      noarch
 
@@ -117,6 +119,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch13 -p1 -b .workspace_num_incr
 %patch14 -p1 -b .default
 %patch15 -p1 -b .pil
+%patch16 -p1 -b .LXDE
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -188,6 +191,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 19 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-4
+- Support LXDE
+
 * Tue Jan 15 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-3
 - Don't import Image directly and import PIL instead for
   F-19 Pillow conversion

From 37c8407f1119f629e60d09d309949acb6531c2cf Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sat, 9 Feb 2013 21:32:19 +0900
Subject: [PATCH 15/57] F-19: kill vendorization of desktop file (fpc#247)

---
 wallpapoz.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 4860005..cf734fa 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      4
+%define         fedorarel      5
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -146,7 +146,9 @@ export PATH=$(pwd)/TMPBINDIR:$PATH
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
+%if 0%{?fedora} < 19
    --vendor fedora \
+%endif
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -188,9 +190,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/gnome/help/%{name}/
 
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Feb  9 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-5
+- F-19: kill vendorization of desktop file (fpc#247)
+
 * Sat Jan 19 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-4
 - Support LXDE
 

From bde997e79a4458253285bf65441d4750c4d83280 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 01:36:23 -0500
Subject: [PATCH 16/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index cf734fa..c9c4022 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -193,6 +193,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-5.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sat Feb  9 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-5
 - F-19: kill vendorization of desktop file (fpc#247)
 

From 1cad863039559ab5d9068ee0f8e543cec339ec30 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Thu, 28 Nov 2013 12:45:57 +0900
Subject: [PATCH 17/57] Support MATE (bug 1029554, leigh scott, Wolfgang
 Ulbrich)

---
 wallpapoz-0.6.2-MATE.patch | 40 ++++++++++++++++++++++++++++++++++++++
 wallpapoz.spec             | 12 ++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 wallpapoz-0.6.2-MATE.patch

diff --git a/wallpapoz-0.6.2-MATE.patch b/wallpapoz-0.6.2-MATE.patch
new file mode 100644
index 0000000..0e376e6
--- /dev/null
+++ b/wallpapoz-0.6.2-MATE.patch
@@ -0,0 +1,40 @@
+--- a/share/wallpapoz/lib/wallpapoz_system.py
++++ b/share/wallpapoz/lib/wallpapoz_system.py
+@@ -115,6 +115,8 @@ class WallpapozSystem:
+         pass
+     if wm_name=='Xfwm4':
+       self.window_manager = 'XFCE4'
++    elif wm_name=='Marco':
++      self.window_manager = 'MATE'
+     else:
+      try:
+       output = os.popen("gnome-session --version")
+@@ -161,6 +163,9 @@ class WallpapozSystem:
+     elif self.window_manager == "Gnome3":
+       os.system("gsettings set org.gnome.desktop.background picture-uri 'file://" + wallpaper + "'")
+       os.system("gsettings set org.gnome.desktop.background picture-options " + self.wallpaper_style)
++    elif self.window_manager == "MATE":
++      os.system('gsettings set org.mate.background picture-filename ' + wallpaper)
++      os.system('gsettings set org.mate.background picture-options ' + self.wallpaper_style)
+     elif self.window_manager == "XFCE4":
+       os.system("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path -s " +
+         '"' + wallpaper + '"')
+@@ -176,6 +181,8 @@ class WallpapozSystem:
+       return os.popen("gconftool-2 -g /desktop/gnome/background/picture_filename").read()[:-1]
+     elif self.window_manager == "Gnome3":
+       return os.popen("gsettings get org.gnome.desktop.background picture-uri").read()[8:-2]
++    elif self.window_manager == "MATE":
++      return os.popen("gsettings get org.mate.background picture-filename").read()[:-1]
+     elif self.window_manager == "XFCE4":
+       return os.popen("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path").read()[:-1]
+     else:
+--- a/src/daemon_wallpapoz
++++ b/src/daemon_wallpapoz
+@@ -111,6 +111,7 @@ if __name__ == "__main__":
+   available_style = {}
+   available_style['Gnome'] = { '3' : 'zoom', '2' : 'scaled', '1' : 'stretched',
+           '0' : 'centered', '4' : 'wallpaper' }
++  available_style['MATE'] = available_style['Gnome']
+   available_style['Gnome3'] = available_style['Gnome']
+   available_style['XFCE4'] = { '3' : '5', '2' : '4', '1' : '3', '0' : '1',
+           '4' : '2' }
diff --git a/wallpapoz.spec b/wallpapoz.spec
index c9c4022..2772fc8 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      5
+%define         fedorarel		6
 
 %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
@@ -77,6 +77,10 @@ Patch14:	wallpapoz-0.6.2-wm-return-to-default.patch
 Patch15:	wallpapoz-0.6.2-import-PIL-for-Image.patch
 # Support LXDE
 Patch16:	wallpapoz-0.6.2-LXDE.patch
+# Support MATE
+# https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c31
+# https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c38
+Patch17:	wallpapoz-0.6.2-MATE.patch
 
 BuildArch:      noarch
 
@@ -120,6 +124,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch14 -p1 -b .default
 %patch15 -p1 -b .pil
 %patch16 -p1 -b .LXDE
+%patch17 -p1 -b .MATE
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -193,6 +198,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Wed Nov 27 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-6
+- Support MATE (bug 1029554, leigh scott, Wolfgang Ulbrich)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 0aeea347d0e0eef75edd7015f5b2df0ea7a90619 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Thu, 12 Dec 2013 16:17:52 +0900
Subject: [PATCH 18/57] Support CINNAMON (bug 1029554, leigh scott)

---
 wallpapoz-0.6.2-CINNAMON.patch | 40 ++++++++++++++++++++++++++++++++++
 wallpapoz.spec                 |  9 +++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 wallpapoz-0.6.2-CINNAMON.patch

diff --git a/wallpapoz-0.6.2-CINNAMON.patch b/wallpapoz-0.6.2-CINNAMON.patch
new file mode 100644
index 0000000..104d83a
--- /dev/null
+++ b/wallpapoz-0.6.2-CINNAMON.patch
@@ -0,0 +1,40 @@
+--- a/share/wallpapoz/lib/wallpapoz_system.py
++++ b/share/wallpapoz/lib/wallpapoz_system.py
+@@ -117,6 +117,8 @@ class WallpapozSystem:
+       self.window_manager = 'XFCE4'
+     elif wm_name=='Marco':
+       self.window_manager = 'MATE'
++    elif wm_name=='Mutter (Muffin)':
++      self.window_manager = 'CINNAMON'
+     else:
+      try:
+       output = os.popen("gnome-session --version")
+@@ -166,6 +168,9 @@ class WallpapozSystem:
+     elif self.window_manager == "MATE":
+       os.system('gsettings set org.mate.background picture-filename ' + wallpaper)
+       os.system('gsettings set org.mate.background picture-options ' + self.wallpaper_style)
++    elif self.window_manager == "CINNAMON":
++      os.system("gsettings set org.cinnamon.desktop.background picture-uri 'file://" + wallpaper + "'")
++      os.system("gsettings set org.cinnamon.desktop.background picture-options " + self.wallpaper_style)
+     elif self.window_manager == "XFCE4":
+       os.system("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path -s " +
+         '"' + wallpaper + '"')
+@@ -183,6 +188,8 @@ class WallpapozSystem:
+       return os.popen("gsettings get org.gnome.desktop.background picture-uri").read()[8:-2]
+     elif self.window_manager == "MATE":
+       return os.popen("gsettings get org.mate.background picture-filename").read()[:-1]
++    elif self.window_manager == "CINNAMON":
++      return os.popen("gsettings get org.cinnamon.desktop.background picture-uri").read()[8:-2]
+     elif self.window_manager == "XFCE4":
+       return os.popen("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path").read()[:-1]
+     else:
+--- a/src/daemon_wallpapoz
++++ b/src/daemon_wallpapoz
+@@ -112,6 +112,7 @@ if __name__ == "__main__":
+   available_style['Gnome'] = { '3' : 'zoom', '2' : 'scaled', '1' : 'stretched',
+           '0' : 'centered', '4' : 'wallpaper' }
+   available_style['MATE'] = available_style['Gnome']
++  available_style['CINNAMON'] = available_style['Gnome']
+   available_style['Gnome3'] = available_style['Gnome']
+   available_style['XFCE4'] = { '3' : '5', '2' : '4', '1' : '3', '0' : '1',
+           '4' : '2' }
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 2772fc8..db4c3cd 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		6
+%define         fedorarel		7
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -81,6 +81,9 @@ Patch16:	wallpapoz-0.6.2-LXDE.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c31
 # https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c38
 Patch17:	wallpapoz-0.6.2-MATE.patch
+# Support CINNAMON
+# https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c44
+Patch18:	wallpapoz-0.6.2-CINNAMON.patch
 
 BuildArch:      noarch
 
@@ -125,6 +128,7 @@ wallpapers for different workspaces or virtual desktops.
 %patch15 -p1 -b .pil
 %patch16 -p1 -b .LXDE
 %patch17 -p1 -b .MATE
+%patch18 -p1 -b .CINNAMON
 
 # Umm... permission fix
 find . -type f -print0 | xargs -0 chmod 0644
@@ -198,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Thu Dec 12 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-7
+- Support CINNAMON (bug 1029554, leigh scott)
+
 * Wed Nov 27 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-6
 - Support MATE (bug 1029554, leigh scott, Wolfgang Ulbrich)
 

From 6029b5d25fd1be78e6ae621e08053fbf9ad46b9b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 23:11:43 -0500
Subject: [PATCH 19/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index db4c3cd..7aff36a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Thu Dec 12 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-7
 - Support CINNAMON (bug 1029554, leigh scott)
 

From 192d5596e713c4744ae5e961ecfd4cee918a7c27 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 02:14:47 +0000
Subject: [PATCH 20/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 7aff36a..4dd3190 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}.2
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-7.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From af283ae492ea2a7456df842e2b92923aeac35e44 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 02:53:39 +0000
Subject: [PATCH 21/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 4dd3190..30ef140 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.2
+Release:        %{rel}%{?dist}.3
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-7.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 9457fca2cad8d64c79c7742dc1de14a66c8b597e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 17:14:42 +0000
Subject: [PATCH 22/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 30ef140..56a90a0 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.3
+Release:        %{rel}%{?dist}.4
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 014f07efe10a54913a74e27408fd4aa57ecba163 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 21:29:09 +0000
Subject: [PATCH 23/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 56a90a0..486ce78 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.4
+Release:        %{rel}%{?dist}.5
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 951a6213132dc3a6087d33b1630993322b418b8a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 20:44:41 +0000
Subject: [PATCH 24/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 486ce78..c75499d 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.5
+Release:        %{rel}%{?dist}.6
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -202,6 +202,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 5d438c7200412e3e38726900c01c4f3b76537410 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 09:17:56 +0100
Subject: [PATCH 25/57] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 wallpapoz.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index c75499d..380533d 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -182,9 +182,6 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 
 %{find_lang} %{name}
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README

From b7cdfecba59fcfe4f36a9e7e6c146c4c1fe0298d Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Wed, 28 Feb 2018 10:45:31 +0100
Subject: [PATCH 26/57] Update Python 2 dependency declarations to new
 packaging standards

---
 wallpapoz.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 380533d..aaaf544 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.6
+Release:        %{rel}%{?dist}.7
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -89,9 +89,9 @@ BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  pygtk2-libglade
-BuildRequires:  python-imaging
+BuildRequires:  python2-imaging
 BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
@@ -100,7 +100,7 @@ BuildRequires:  gnome-python2-gnome
 # Because wallpapoz uses gconftool-2 or so
 Requires:       GConf2
 Requires:       pygtk2-libglade
-Requires:       python-imaging
+Requires:       python2-imaging
 Requires:       gnome-python2-gnome
 Requires:       xorg-x11-utils
 Requires:       %{_bindir}/kill
@@ -199,6 +199,10 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.6.2-7.7
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 47dc93e21af224886b8239326b6ca7dbea731c66 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Jul 2018 01:36:39 -0500
Subject: [PATCH 27/57] Remove needless use of %defattr

---
 wallpapoz.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index aaaf544..e2e46f4 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -183,7 +183,6 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{find_lang} %{name}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
 %{_libexecdir}/daemon_wallpapoz

From e1c9167cc994403ee3e1d0df87232861a2b8e705 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 10 Jul 2018 22:33:23 +0900
Subject: [PATCH 28/57] =?UTF-8?q?=E3=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wallpapoz.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index e2e46f4..aaaf544 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -183,6 +183,7 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{find_lang} %{name}
 
 %files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
 %{_libexecdir}/daemon_wallpapoz

From 228b7d3f43b568c986542c7ffd6b82eae9c60eaf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:42:44 +0000
Subject: [PATCH 29/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index aaaf544..1988a7a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.7
+Release:        %{rel}%{?dist}.8
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
@@ -199,6 +199,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.6.2-7.7
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

From b03ac15e4b0b990e5ec97fd4cc27ecfefa441fd6 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 16 Jul 2018 11:04:17 +0900
Subject: [PATCH 30/57] python2

---
 wallpapoz.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 1988a7a..6cccba2 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -150,7 +150,7 @@ ln -sf c share/gnome/help/wallpapoz/C
 %{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
 
 export PATH=$(pwd)/TMPBINDIR:$PATH
-%{__python} setup.py install --installdir=$RPM_BUILD_ROOT%{_prefix}
+%{__python2} setup.py install --installdir=$RPM_BUILD_ROOT%{_prefix}
 
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

From d29d7768501bd7798b0f2d5049ba6edea3298deb Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:30 +0100
Subject: [PATCH 31/57] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 wallpapoz.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 6cccba2..ec7fa2a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -17,7 +17,6 @@ Version:        %{mainver}
 Release:        %{rel}%{?dist}.8
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
-Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://vajrasky.wordpress.com/wallpapoz/
 Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2

From a5b1c4f4c4a6462e04cfe19d4f920b98569cdb0b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 11:31:45 +0000
Subject: [PATCH 32/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index ec7fa2a..0aaa3e4 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.8
+Release:        %{rel}%{?dist}.9
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -198,6 +198,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 9fd267c2d0e9f5647337cc7ac29b3ade7eb13831 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 4 Feb 2019 15:01:55 +0900
Subject: [PATCH 33/57] Use python2 explicitly

---
 wallpapoz.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 0aaa3e4..8f7262d 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		7
+%define         fedorarel		8
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.9
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -133,6 +133,9 @@ wallpapers for different workspaces or virtual desktops.
 find . -type f -print0 | xargs -0 chmod 0644
 grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
 
+grep -rl --null '/usr/bin/env python$' . | \
+	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
+
 # For setup
 mkdir TMPBINDIR
 pushd TMPBINDIR
@@ -198,6 +201,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Mon Feb  4 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-8
+- Use python2 explicitly
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-7.9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From c16380deb74fa777ae9adf7b9b4a826fb0e5c203 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 03:16:31 +0000
Subject: [PATCH 34/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 8f7262d..1b1e019 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -201,6 +201,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-8.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Mon Feb  4 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-8
 - Use python2 explicitly
 

From 4e69ef95912626734d0d0741d512bca3fb9f7a8a Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Fri, 23 Aug 2019 18:24:01 +0900
Subject: [PATCH 35/57] F-31+: Drop gnome-python2-gnome dependency for now

---
 wallpapoz.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 1b1e019..aedaa3c 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		8
+%define         fedorarel		9
 
 %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
 
 License:        GPLv2+
@@ -91,16 +91,16 @@ BuildRequires:  gettext
 BuildRequires:  python2-devel
 BuildRequires:  pygtk2-libglade
 BuildRequires:  python2-imaging
-BuildRequires:  gnome-python2
+#BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
-BuildRequires:  gnome-python2-gnome
+#BuildRequires:  gnome-python2-gnome
 %endif
 # Because wallpapoz uses gconftool-2 or so
 Requires:       GConf2
 Requires:       pygtk2-libglade
 Requires:       python2-imaging
-Requires:       gnome-python2-gnome
+#Requires:       gnome-python2-gnome
 Requires:       xorg-x11-utils
 Requires:       %{_bindir}/kill
 Requires:       %{_bindir}/pgrep
@@ -201,6 +201,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Aug 23 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-9
+- F-31+: Drop gnome-python2-gnome dependency for now
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-8.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 68cc93d4c0f3b27693cd48400f382806793dc116 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sun, 1 Sep 2019 21:17:55 +0900
Subject: [PATCH 36/57] Escape white spaces in wallpaper name properly

---
 wallpapoz-0.6.2-LXDE.patch | 2 +-
 wallpapoz-0.6.2-MATE.patch | 2 +-
 wallpapoz.spec             | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wallpapoz-0.6.2-LXDE.patch b/wallpapoz-0.6.2-LXDE.patch
index 7b42b44..aafcf16 100644
--- a/wallpapoz-0.6.2-LXDE.patch
+++ b/wallpapoz-0.6.2-LXDE.patch
@@ -20,7 +20,7 @@
        os.system("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-style -s " +
          self.wallpaper_style)
 +    elif self.window_manager == "LXDE":
-+      os.system("pcmanfm -w " + wallpaper)
++      os.system("pcmanfm -w " + '"' + wallpaper + '"')
 +      os.system("pcmanfm --wallpaper-mode=" + self.wallpaper_style)
  
    ## class method to find current desktop wallpaper
diff --git a/wallpapoz-0.6.2-MATE.patch b/wallpapoz-0.6.2-MATE.patch
index 0e376e6..8f31556 100644
--- a/wallpapoz-0.6.2-MATE.patch
+++ b/wallpapoz-0.6.2-MATE.patch
@@ -14,7 +14,7 @@
        os.system("gsettings set org.gnome.desktop.background picture-uri 'file://" + wallpaper + "'")
        os.system("gsettings set org.gnome.desktop.background picture-options " + self.wallpaper_style)
 +    elif self.window_manager == "MATE":
-+      os.system('gsettings set org.mate.background picture-filename ' + wallpaper)
++      os.system('gsettings set org.mate.background picture-filename ' + '"' + wallpaper + '"')
 +      os.system('gsettings set org.mate.background picture-options ' + self.wallpaper_style)
      elif self.window_manager == "XFCE4":
        os.system("xfconf-query -c xfce4-desktop -p /backdrop/screen0/monitor0/image-path -s " +
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 8f7262d..1d7fd7a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -201,6 +201,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Sep  1 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-8.1
+- Escape white spaces in wallpaper name properly
+
 * Mon Feb  4 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-8
 - Use python2 explicitly
 

From 5f607a378a89de8d43ba29c6c250cb16912ecccb Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sun, 1 Sep 2019 21:21:07 +0900
Subject: [PATCH 37/57] push script

---
 wallpapoz-glade-builder-convert.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 wallpapoz-glade-builder-convert.sh

diff --git a/wallpapoz-glade-builder-convert.sh b/wallpapoz-glade-builder-convert.sh
new file mode 100644
index 0000000..5d170cf
--- /dev/null
+++ b/wallpapoz-glade-builder-convert.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/bash
+set -x
+
+ORIG_XML=./share/wallpapoz/glade/wallpapoz.glade
+NEWTOPDIR=wallpapoz-0.6.2-builder
+DIR_XML=$(dirname $ORIG_XML)
+BASE_XML=$(basename $ORIG_XML)
+
+mkdir -p $NEWTOPDIR/$DIR_XML || true
+
+cat ./src/wallpapoz | sed -n -e '\@gtk.glade.XML@s|^.*"\(.*\)".*$|\1|p' | while read item
+do
+	SPLIT_ORIG_XML=${DIR_XML}/wallpapoz-old-${item}.glade
+	NEW_BUILDER_XML=${DIR_XML}/wallpapoz-builder-${item}.glade
+
+	> $NEWTOPDIR/$SPLIT_ORIG_XML
+	head -n 5 $ORIG_XML >> $NEWTOPDIR/$SPLIT_ORIG_XML
+	cat $ORIG_XML | sed -n -e "\@^<widget class.*"${item}"@,\@^</widget>\$@p" >> $NEWTOPDIR/$SPLIT_ORIG_XML
+	echo >> $NEWTOPDIR/$SPLIT_ORIG_XML
+	tail -n -1 $ORIG_XML >> $NEWTOPDIR/$SPLIT_ORIG_XML
+
+	gtk-builder-convert $NEWTOPDIR/$SPLIT_ORIG_XML $NEWTOPDIR/$NEW_BUILDER_XML
+	sed -i $NEWTOPDIR/$NEW_BUILDER_XML \
+		-e "\@has_resize_grip@d" \
+		-e "\@has_separator@d"
+done

From bde4535d05ed32bb1ac701e7b921a223b438da17 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sun, 1 Sep 2019 21:26:13 +0900
Subject: [PATCH 38/57] add fix CINNAMON patch

---
 wallpapoz-0.6.2-CINNAMON.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wallpapoz-0.6.2-CINNAMON.patch b/wallpapoz-0.6.2-CINNAMON.patch
index 104d83a..3fe5866 100644
--- a/wallpapoz-0.6.2-CINNAMON.patch
+++ b/wallpapoz-0.6.2-CINNAMON.patch
@@ -11,7 +11,7 @@
        output = os.popen("gnome-session --version")
 @@ -166,6 +168,9 @@ class WallpapozSystem:
      elif self.window_manager == "MATE":
-       os.system('gsettings set org.mate.background picture-filename ' + wallpaper)
+       os.system('gsettings set org.mate.background picture-filename ' + '"' + wallpaper + '"')
        os.system('gsettings set org.mate.background picture-options ' + self.wallpaper_style)
 +    elif self.window_manager == "CINNAMON":
 +      os.system("gsettings set org.cinnamon.desktop.background picture-uri 'file://" + wallpaper + "'")

From 2184262347526477301de2bcbb85ec2633b944d2 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 2 Sep 2019 15:16:42 +0900
Subject: [PATCH 39/57] Switch to python3

---
 .gitignore                    |   1 +
 sources                       |   3 +-
 wallpapoz-0.6.2-python3.patch | 786 ++++++++++++++++++++++++++++++++++
 wallpapoz.spec                |  40 +-
 4 files changed, 820 insertions(+), 10 deletions(-)
 create mode 100644 wallpapoz-0.6.2-python3.patch

diff --git a/.gitignore b/.gitignore
index e26b6ef..05e45bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wallpapoz-0.4.1-svn92_trunk.tar.bz2
 /wallpapoz-0.5.tar.bz2
 /wallpapoz-0.6.1.tar.bz2
 /wallpapoz-0.6.2.tar.bz2
+/wallpapoz-0.6.2-builder.tar.bz2
diff --git a/sources b/sources
index f8b4dab..2ca14fd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-15f052342281eb587bba98c7d6999ce9  wallpapoz-0.6.2.tar.bz2
+SHA512 (wallpapoz-0.6.2.tar.bz2) = 36ed198ba72e08f33ed92dca173f41eb7e7d307366ad42b7cfac2659511f42980351eeb4c02f155469fdf75be79fad37d77bb02118ad91f39da22dae5246860b
+SHA512 (wallpapoz-0.6.2-builder.tar.bz2) = a1e567ca0fa5dde9ba1eb0d143c1618789fc6fff50e09390ea8edde2afd8cdf5d9e95ace8e287a3791766f5a2369717e1a3a81c17a7197c04cc988d6d0a89346
diff --git a/wallpapoz-0.6.2-python3.patch b/wallpapoz-0.6.2-python3.patch
new file mode 100644
index 0000000..533dcfb
--- /dev/null
+++ b/wallpapoz-0.6.2-python3.patch
@@ -0,0 +1,786 @@
+diff -urp wallpapoz-0.6.2.py2/setup.py wallpapoz-0.6.2.py3/setup.py
+--- wallpapoz-0.6.2.py2/setup.py	2019-09-02 14:04:36.124389528 +0900
++++ wallpapoz-0.6.2.py3/setup.py	2019-09-02 14:50:57.162142691 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ #=============================================================================
+@@ -62,7 +62,7 @@ Options:
+ """)
+ 
+ def info():
+-  print usage_info
++  print (usage_info)
+   sys.exit(1)
+ 
+ def install(src, dst):
+@@ -73,9 +73,9 @@ def install(src, dst):
+     if not os.path.isdir(os.path.dirname(dst)):
+       os.makedirs(os.path.dirname(dst))
+     shutil.copy2(src, dst)
+-    print _("Installed"), dst
++    print (_("Installed"), dst)
+   except:
+-    print _("Error while installing"), dst
++    print (_("Error while installing"), dst)
+ 
+ def uninstall(path):
+   try:
+@@ -86,71 +86,75 @@ def uninstall(path):
+       shutil.rmtree(path)
+     else:
+       return
+-    print _("Removed"), path
++    print (_("Removed"), path)
+   except:
+-    print _("Error while removing"), path
++    print (_("Error while removing"), path)
+ 
+ def check_dependencies():
+   required_found = True
+   recommended_found = True
+-  print _("Checking dependencies...")
++  print (_("Checking dependencies..."))
+   print
+-  print _("Required dependencies:")
++  print (_("Required dependencies:"))
+   print
+   # Should also check the PyGTK version. To do that we have to load the
+   # gtk module though, which normally can't be done while using `sudo`.
+   try:
+-    import pygtk
+-    print "    PyGTK ........................ OK"
++    #import pygtk
++    import gi
++    gi.require_version("Gtk", "3.0")
++    from gi.repository import Gtk
++    print ("    PyGTK ........................ OK")
+   except ImportError:
+-    print "    !!! PyGTK .................... ", _("Not found")
++    print ("    !!! PyGTK .................... ", _("Not found"))
+     required_found = False
+   try:
+     # shutdown the warnings
+     import warnings
+     warnings.simplefilter("ignore", Warning)
+-    import gtk.glade
+-    print "    Python Glade ................. OK"
+-  except ImportError:
+-    print "    !!! Python Glade ............. ", _("Not found")
++    #import gtk.glade
++    Gtk.Builder()
++    print ("    Python Glade ................. OK")
++  except (ImportError, AttributeError):
++    print ("    !!! Python Glade ............. ", _("Not found"))
+     required_found = False
+   except RuntimeError:
+     # so we can check dependency when there is no DISPLAY
+     warnings.simplefilter("default", Warning)
+     if not os.environ.get("DISPLAY"):
+-      print "    Python Glade ................. SKIP"
++      print ("    Python Glade ................. SKIP")
+     else:
+-      print "    !!! Python Glade ............. ", _("Not found")
+-      required_found = False
++      print ("    !!! Python Glade ............. ", _("Not found"))
++      #required_found = False
+   try:
+     from PIL import Image
+-    print "    Python Imaging Library ....... OK"
++    print ("    Python Imaging Library ....... OK")
+   except ImportError:
+-    print "    !!! Python Imaging Library ... ", _("Not found")
++    print ("    !!! Python Imaging Library ... ", _("Not found"))
+     required_found = False
+   try:
+     import gnome
+-    print "    Gnome Python ................. OK"
++    print ("    Gnome Python ................. OK")
+   except ImportError:
+-    print "    !!! Gnome Python ............. ", _("Not found")
++    print ("    !!! Gnome Python ............. ", _("Not found"))
+     recommended_found = False
+   out = os.popen('which xwininfo').readlines
+   if out == []:
+-    print "    Xwininfo tool ................ ", _("Not found")
++    print ("    Xwininfo tool ................ ", _("Not found"))
+     required_found = False
+   else:
+-    print "    Xwininfo tool ................ OK"
++    print ("    Xwininfo tool ................ OK")
+ 
+   if not required_found:
+     print
+-    print _("Could not find all required dependencies!")
+-    print _("Please install them and try again.")
++    print (_("Could not find all required dependencies!"))
++    print (_("Please install them and try again."))
+     print
+     sys.exit(1)
+   if not recommended_found:
+     print
+-    print _("Gnome Python is not found. Wallpapoz still could be used and it has been installed.")
+-    print _("But it means you can not access help documentation in your native language if it is available.")
++    print (_("Gnome Python is not found. Wallpapoz still could be used and it has been installed."))
++    print (_("But it means you can not access help documentation in your native language if it is available."))
+     print
+ 
+ install_dir = "/usr/local/"
+@@ -166,12 +170,12 @@ for opt, value in opts:
+   if opt == "--installdir":
+     install_dir = value
+     if not os.path.isdir(install_dir):
+-      print _("\n*** Error:"), install_dir, _("does not exist.\n" )
++      print (_("\n*** Error:"), install_dir, _("does not exist.\n" ))
+       info()
+ 
+ if args == ["install"]:
+   check_dependencies()
+-  print _("Installing Wallpapoz in"), install_dir, "...\n"
++  print (_("Installing Wallpapoz in"), install_dir, "...\n")
+   install("src/wallpapoz", "bin/wallpapoz")
+   install("src/daemon_wallpapoz", "bin/daemon_wallpapoz")
+   install("src/launcher_wallpapoz.sh", "bin/launcher_wallpapoz.sh")
+@@ -193,7 +197,7 @@ if args == ["install"]:
+       "share/gnome/help/wallpapoz/" + lang + "/legal.xml")
+ 
+ elif args == ["uninstall"]:
+-  print _("Uninstalling Wallpapoz from"), install_dir, "...\n"
++  print (_("Uninstalling Wallpapoz from"), install_dir, "...\n")
+   uninstall("bin/wallpapoz")
+   uninstall("bin/daemon_wallpapoz")
+   uninstall("bin/launcher_wallpapoz.sh")
+@@ -211,11 +215,11 @@ elif args == ["uninstall"]:
+     uninstall("share/gnome/help/wallpapoz/" + lang + "/wallpapoz.xml")
+     uninstall("share/gnome/help/wallpapoz/" + lang + "/legal.xml")
+   print
+-  print _("""
++  print (_("""
+ There might still be files in ~/.wallpapoz/ left on your system.
+ Please remove that directory manually if you do not plan to
+ install Wallpapoz again later.
+-""")
++"""))
+ 
+ else:
+   info()
+diff -urp wallpapoz-0.6.2.py2/share/wallpapoz/lib/wallpapoz_system.py wallpapoz-0.6.2.py3/share/wallpapoz/lib/wallpapoz_system.py
+--- wallpapoz-0.6.2.py2/share/wallpapoz/lib/wallpapoz_system.py	2019-09-02 14:04:36.105389275 +0900
++++ wallpapoz-0.6.2.py3/share/wallpapoz/lib/wallpapoz_system.py	2019-09-01 21:08:35.000000000 +0900
+@@ -44,8 +44,8 @@ class WallpapozSystem:
+ 
+     # Check if total_workspaces changed only here
+     if WallpapozSystem.static_total_workspaces != self.total_workspaces:
+-      print "daemon_wallpapoz: the number of total workspaces changed during initialization process."
+-      print "daemon_wallpapoz: respawning daemon_wallpapoz."
++      print ("daemon_wallpapoz: the number of total workspaces changed during initialization process.")
++      print ("daemon_wallpapoz: respawning daemon_wallpapoz.")
+       self.respawn_system()
+ 
+   def exec_cmd_under_X(self, cmd):
+@@ -57,32 +57,35 @@ class WallpapozSystem:
+         shell = True
+         )
+     except OSError:
+-      print "daemon_wallpapoz: fork failed for %s, exiting." %cmd
++      print ("daemon_wallpapoz: fork failed for %s, exiting." %cmd)
+       sys.exit(1)
+ 
+     pstdout = p.stdout.read()
+     pstderr = p.stderr.read()
+     ret = p.wait()
++    # FIXME
++    pstdout_str = pstdout.decode('utf-8')
+ 
+     kill_daemon = False
+ 
+     if (ret != 0) and (ret & 0xFF):
+-        print "daemon_wallpapoz: %s returned status %i." %(cmd, ret)
+-        print "daemon_wallpapoz: error message: %s" %pstderr
++        print ("daemon_wallpapoz: %s returned status %i." %(cmd, ret))
++        print ("daemon_wallpapoz: error message: %s" %pstderr)
+         kill_daemon = True
+ 
+-    if (cmd.find('xprop') >= 0) and (pstdout.find('no such atom') >= 0):
++    if (cmd.find('xprop') >= 0) and (pstdout_str.find('no such atom') >= 0):
+         kill_daemon = True
+-    if (cmd.find('xprop') >= 0) and (pstdout.find('not') >= 0):
++    if (cmd.find('xprop') >= 0) and (pstdout_str.find('not') >= 0):
+         kill_daemon = True
+ 
+     if kill_daemon:
+         ## No X resource available, kill daemon_wallpapoz
+-        print "daemon_wallpapoz: X resource seems no longer available."
+-        print "daemon_wallpapoz: killing daemon_wallpapoz."
++        print ("daemon_wallpapoz: X resource seems no longer available.")
++        print ("daemon_wallpapoz: killing daemon_wallpapoz.")
+         sys.exit(1)
+ 
+-    return pstdout
++    #FIXME
++    return pstdout_str
+ 
+   def set_style(self, style):
+     self.wallpaper_style = style
+@@ -209,7 +212,7 @@ class WallpapozSystem:
+     new_argv = []
+     new_argv.extend(sys.argv)
+     os.execvp('daemon_wallpapoz', new_argv)
+-    print "os.execvp failed, exiting..."
++    print ("os.execvp failed, exiting...")
+     sys.exit(1)
+ 
+   def prevent_multiple_start(self):
+diff -urp wallpapoz-0.6.2.py2/share/wallpapoz/lib/xml_processing.py wallpapoz-0.6.2.py3/share/wallpapoz/lib/xml_processing.py
+--- wallpapoz-0.6.2.py2/share/wallpapoz/lib/xml_processing.py	2012-02-20 03:57:12.000000000 +0900
++++ wallpapoz-0.6.2.py3/share/wallpapoz/lib/xml_processing.py	2019-09-01 21:23:33.000000000 +0900
+@@ -28,7 +28,9 @@ import xml
+ import os
+ import sys
+ import gettext
+-import gtk
++import gi
++gi.require_version("Gtk", "3.0")
++from gi.repository import Gtk, GObject
+ from wallpapoz_system import WallpapozSystem
+ 
+ # i18n
+@@ -36,8 +38,8 @@ APP = "wallpapoz"
+ DIR = "../../locale"
+ gettext.bindtextdomain(APP, DIR)
+ gettext.textdomain(APP)
+-gtk.glade.bindtextdomain(APP, DIR)
+-gtk.glade.textdomain(APP)
++#gtk.glade.bindtextdomain(APP, DIR)
++#gtk.glade.textdomain(APP)
+ _ = gettext.gettext
+ 
+ ## XMLProcessing -- class for processing wallpapoz xml file
+@@ -64,7 +66,7 @@ class XMLProcessing:
+     # if wallpapoz run for the first time ( no configuration file )
+     # we make default list, for every workspace, we give one wallpaper that is our current wallpaper
+     if not os.path.exists(self.config_file):
+-      print _("No configuration file. Use default configuration.")
++      print (_("No configuration file. Use default configuration."))
+       home = os.environ['HOME']
+       if not os.path.exists(home + '/.wallpapoz'):
+         os.makedirs(home + '/.wallpapoz')
+@@ -75,7 +77,7 @@ class XMLProcessing:
+     try:
+       self.xmldoc = minidom.parse(self.config_file)
+     except xml.parsers.expat.ExpatError:
+-      print _("The configuration file is corrupted. Remove it then create a new one again with Wallpapoz!")
++      print (_("The configuration file is corrupted. Remove it then create a new one again with Wallpapoz!"))
+       sys.exit()
+ 
+     # wallpapoz node
+@@ -101,7 +103,7 @@ class XMLProcessing:
+     try:
+       self.xmldoc = minidom.parse(self.config_file)
+     except xml.parsers.expat.ExpatError:
+-      print _("The configuration file is corrupted. Remove it then create a new one again with Wallpapoz!")
++      print (_("The configuration file is corrupted. Remove it then create a new one again with Wallpapoz!"))
+       sys.exit()
+ 
+     # wallpapoz node
+@@ -287,7 +289,7 @@ class XMLProcessing:
+   # save the xml file
+   def save(self):
+     xml_file = open(self.config_file, "w")
+-    xml_file.write( self.xmldoc.toxml("utf-8") )
++    xml_file.write( self.xmldoc.toxml("utf-8").decode("utf-8") )
+ 
+   # fill list with default value
+   def default_fill_list(self, type):
+@@ -406,4 +408,4 @@ class XMLProcessing:
+ 
+     # create it
+     xml_file = open(self.config_file, "w")
+-    xml_file.write( newdoc.toxml("utf-8") )
++    xml_file.write( newdoc.toxml("utf-8").decode("utf-8") )
+diff -urp wallpapoz-0.6.2.py2/src/daemon_wallpapoz wallpapoz-0.6.2.py3/src/daemon_wallpapoz
+--- wallpapoz-0.6.2.py2/src/daemon_wallpapoz	2019-09-02 14:04:36.168390114 +0900
++++ wallpapoz-0.6.2.py3/src/daemon_wallpapoz	2019-09-01 20:59:43.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ #================================================
+@@ -33,7 +33,7 @@ import array
+ import time
+ import threading
+ import random
+-import gtk.glade
++#import gtk.glade
+ import string
+ 
+ # so we can call from anywhere
+@@ -133,7 +133,7 @@ if __name__ == "__main__":
+     total_workspaces = wallpapoz_system.get_total_workspaces()
+ 
+     # create the index for wallpaper list thread
+-    number.fromlist( range( total_workspaces ) )
++    number.fromlist( list(range( total_workspaces ) ) )
+ 
+     # previous workspace
+     previous_desktop = -1
+diff -urp wallpapoz-0.6.2.py2/src/wallpapoz wallpapoz-0.6.2.py3/src/wallpapoz
+--- wallpapoz-0.6.2.py2/src/wallpapoz	2019-09-02 14:04:36.159389994 +0900
++++ wallpapoz-0.6.2.py3/src/wallpapoz	2019-09-02 14:13:50.533772653 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ #=============================================================================
+@@ -27,10 +27,10 @@
+ ## wallpapoz.py -- the gui tool for creating configuration file and
+ # calling daemon program
+ 
+-import pygtk
+-pygtk.require('2.0')
+-import gtk.glade
+-import gobject
++import gi
++gi.require_version("Gtk", "3.0")
++from gi.repository import Gtk as gtk, GObject as gobject, Gdk as gdk
++from gi.repository import GdkPixbuf
+ import os
+ import sys
+ import stat
+@@ -55,8 +55,8 @@ APP = "wallpapoz"
+ DIR = "../share/locale"
+ gettext.bindtextdomain(APP, DIR)
+ gettext.textdomain(APP)
+-gtk.glade.bindtextdomain(APP, DIR)
+-gtk.glade.textdomain(APP)
++#gtk.glade.bindtextdomain(APP, DIR)
++#gtk.glade.textdomain(APP)
+ _ = gettext.gettext
+ 
+ # main class for the gui. This gui will contruct the configuration file that will be used by daemon
+@@ -69,25 +69,32 @@ class Wallpapoz:
+   # the contructor
+   def __init__(self):
+     # wallpapoz glade file
+-    self.wallpapoz_glade_file = "../share/wallpapoz/glade/wallpapoz.glade"
++    #self.wallpapoz_glade_file = "../share/wallpapoz/glade/wallpapoz.glade"
++    self.wallpapoz_builder_file = "../share/wallpapoz/glade/wallpapoz-builder-wallpapoz_window.glade"
+ 
+     # call the xmlprocessing class to read it later on method related to treeview
+     self.wallpapozxml = XMLProcessing()
+ 
+     # Load the glade
+-    self.main_window = gtk.glade.XML(self.wallpapoz_glade_file, "wallpapoz_window", APP)
++    self.builder = gtk.Builder()
++    self.builder.set_translation_domain(APP)
++    self.builder.add_from_file(self.wallpapoz_builder_file)
++    #self.main_window = gtk.glade.XML(self.wallpapoz_glade_file, "wallpapoz_window", APP)
++    self.main_window = self.builder.get_object("wallpapoz_window")
+ 
+     # window widget
+-    self.main_window_widget = self.main_window.get_widget("wallpapoz_window")
++    self.main_window_widget = self.builder.get_object("wallpapoz_window")
+ 
+     # treeview widget
+-    self.treeview_widget = self.main_window.get_widget("treeview")
++    self.treeview_widget = self.builder.get_object("treeview")
++    # FIXME set here
++    self.treeselection = self.treeview_widget.get_selection()
+ 
+     # image widget
+-    self.image_widget = self.main_window.get_widget("wallpaper_image")
++    self.image_widget = self.builder.get_object("wallpaper_image")
+ 
+     # image filename widget
+-    self.wallpaper_filename = self.main_window.get_widget("wallpaper_name_label")
++    self.wallpaper_filename = self.builder.get_object("wallpaper_name_label")
+ 
+     # create the pop up menu when we right click the treeview widget
+     self.set_up_popup_menu()
+@@ -121,7 +128,7 @@ class Wallpapoz:
+             "on_move_up_activate" : self.move_up_node,
+             "on_move_down_activate" : self.move_down_node,
+             "on_treeview_button_press_event" : self.right_click_menu }
+-    self.main_window.signal_autoconnect(dic)
++    self.builder.connect_signals(dic)
+ 
+     # show treeview
+     self.load_treeview()
+@@ -132,16 +139,16 @@ class Wallpapoz:
+   # set up popup menu when we right click the treeview widget
+   def set_up_popup_menu(self):
+     self.popup_menu = gtk.Menu()
+-    add_wallpapers_files_menu = gtk.MenuItem(_("Add Wallpapers (Files)"))
+-    add_wallpapers_directory_menu = gtk.MenuItem(_("Add Wallpapers (Directory)"))
+-    self.cut_menu = gtk.MenuItem(_("Cut"))
+-    self.copy_menu = gtk.MenuItem(_("Copy"))
+-    paste_menu = gtk.MenuItem(_("Paste"))
+-    self.rename_workspace_menu = gtk.MenuItem(_("Rename Workspace"))
+-    self.change_wallpaper_menu = gtk.MenuItem(_("Change Wallpaper"))
+-    self.delete_wallpapers_menu = gtk.MenuItem(_("Delete Wallpapers"))
+-    move_up_menu = gtk.MenuItem(_("Move Up"))
+-    move_down_menu = gtk.MenuItem(_("Move Down"))
++    add_wallpapers_files_menu = gtk.MenuItem(label=_("Add Wallpapers (Files)"))
++    add_wallpapers_directory_menu = gtk.MenuItem(label=_("Add Wallpapers (Directory)"))
++    self.cut_menu = gtk.MenuItem(label=_("Cut"))
++    self.copy_menu = gtk.MenuItem(label=_("Copy"))
++    paste_menu = gtk.MenuItem(label=_("Paste"))
++    self.rename_workspace_menu = gtk.MenuItem(label=_("Rename Workspace"))
++    self.change_wallpaper_menu = gtk.MenuItem(label=_("Change Wallpaper"))
++    self.delete_wallpapers_menu = gtk.MenuItem(label=_("Delete Wallpapers"))
++    move_up_menu = gtk.MenuItem(label=_("Move Up"))
++    move_down_menu = gtk.MenuItem(label=_("Move Down"))
+     add_wallpapers_files_menu.connect("activate", self.add_wallpapers_files)
+     add_wallpapers_directory_menu.connect("activate", self.add_wallpapers_directory)
+     self.cut_menu.connect("activate", self.cut_treenode)
+@@ -175,8 +182,8 @@ class Wallpapoz:
+ 
+   # popup menu when user right-click the treeview widget
+   def right_click_menu(self, widget, event):
+-    if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
+-      self.popup_menu.popup(None, None, None, event.button, event.time)
++    if event.type == gdk.EventType.BUTTON_PRESS and event.button == 3:
++      self.popup_menu.popup(None, None, None, None, event.button, event.time)
+ 
+   def restart_daemon(self, widget):
+     self.stop_daemon(None)
+@@ -201,8 +208,12 @@ class Wallpapoz:
+ 
+   # when user click about menu item, show about dialog
+   def display_about(self, widget):
+-    about_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "wallpapoz_about_dialog", APP)
+-    aboutdlg_widget = about_dialog.get_widget("wallpapoz_about_dialog")
++    #about_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "wallpapoz_about_dialog", APP)
++    self.about_dialog_builder_file = "../share/wallpapoz/glade/wallpapoz-builder-wallpapoz_about_dialog.glade"
++    self.about_dialog_builder = gtk.Builder()
++    self.about_dialog_builder.set_translation_domain(APP)
++    self.about_dialog_builder.add_from_file(self.about_dialog_builder_file)
++    aboutdlg_widget = self.about_dialog_builder.get_object("wallpapoz_about_dialog")
+     aboutdlg_widget.connect('response', lambda w, e: aboutdlg_widget.destroy())
+ 
+   # get the selection iter
+@@ -326,15 +337,17 @@ class Wallpapoz:
+       dialog_title = _("Choose Wallpapers")
+ 
+     # our filechooser dialog
+-    filechooser_dialog = gtk.FileChooserDialog(dialog_title, self.main_window_widget, gtk.FILE_CHOOSER_ACTION_OPEN)
++    filechooser_dialog = gtk.FileChooserDialog(dialog_title, self.main_window_widget, gtk.FileChooserAction.OPEN)
+ 
+     # our button
+-    cancel_button = filechooser_dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
++    cancel_button = filechooser_dialog.add_button(gtk.STOCK_CANCEL, gtk.ResponseType.CANCEL)
+     if type_of_ok_button == "change":
+-      ok_button = filechooser_dialog.add_button(_("Change"), gtk.RESPONSE_OK)
++      ok_button = filechooser_dialog.add_button(_("Change"), gtk.ResponseType.OK)
+     elif type_of_ok_button == "add":
+-      ok_button = filechooser_dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+-      gtk.Tooltips().set_tip(ok_button, _("Add wallpapers"))
++      ok_button = filechooser_dialog.add_button(gtk.STOCK_OK, gtk.ResponseType.OK)
++      # FIXME
++      #gtk.Tooltips().set_tip(ok_button, _("Add wallpapers"))
++      ok_button.set_tooltip_text(_("Add wallpapers"))
+ 
+     # cancel will quit the filechooser dialog
+     cancel_button.connect("clicked", lambda w: filechooser_dialog.destroy())
+@@ -379,7 +392,7 @@ class Wallpapoz:
+     filechooser_dialog.set_select_multiple(True)
+ 
+     # if user choose the file, add his choice to treeview
+-    if filechooser_dialog.run() == gtk.RESPONSE_OK:
++    if filechooser_dialog.run() == gtk.ResponseType.OK:
+       # get the list of filename that we choose to add
+       filenames = filechooser_dialog.get_filenames()
+ 
+@@ -436,15 +449,21 @@ class Wallpapoz:
+ 
+   # show up the preferences dialog
+   def preferences_option(self, widget):
+-    self.preferences_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "preferences_dialog", APP)
+-    preferences_dialog_widget = self.preferences_dialog.get_widget("preferences_dialog")
++    #self.preferences_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "preferences_dialog", APP)
++    self.preferences_dialog_builder_file =  "../share/wallpapoz/glade/wallpapoz-builder-preferences_dialog.glade"
++    self.preferences_dialog_builder = gtk.Builder()
++    self.preferences_dialog_builder.set_translation_domain(APP)
++    self.preferences_dialog_builder.add_from_file(self.preferences_dialog_builder_file)
++    # FIXME
++    self.preferences_dialog = self.preferences_dialog_builder
++    preferences_dialog_widget = self.preferences_dialog.get_object("preferences_dialog")
+ 
+     # input widgets
+-    time_changed_widget = self.preferences_dialog.get_widget("preferences_dialog_spin_button_time")
+-    random_order_widget = self.preferences_dialog.get_widget("preferences_dialog_show_wallpaper_random_order")
+-    changing_workspace_widget = self.preferences_dialog.get_widget("preferences_dialog_change_wallpaper_changing_workspace")
+-    style_widget = self.preferences_dialog.get_widget("preferences_dialog_style_combobox")
+-    size_widget = self.preferences_dialog.get_widget("preferences_dialog_size_combobox")
++    time_changed_widget = self.preferences_dialog.get_object("preferences_dialog_spin_button_time")
++    random_order_widget = self.preferences_dialog.get_object("preferences_dialog_show_wallpaper_random_order")
++    changing_workspace_widget = self.preferences_dialog.get_object("preferences_dialog_change_wallpaper_changing_workspace")
++    style_widget = self.preferences_dialog.get_object("preferences_dialog_style_combobox")
++    size_widget = self.preferences_dialog.get_object("preferences_dialog_size_combobox")
+ 
+     # load value from xml file
+     time_changed_widget.set_value(float(self.wallpapozxml.delay()))
+@@ -458,19 +477,19 @@ class Wallpapoz:
+     changing_workspace_widget.set_active(self.wallpapozxml.change_wallpaper_when_changing_workspace())
+ 
+     # button
+-    cancel_button = self.preferences_dialog.get_widget("preferences_cancel_button")
++    cancel_button = self.preferences_dialog.get_object("preferences_cancel_button")
+     cancel_button.connect("clicked", lambda w: preferences_dialog_widget.destroy())
+ 
+-    ok_button = self.preferences_dialog.get_widget("preferences_ok_button")
++    ok_button = self.preferences_dialog.get_object("preferences_ok_button")
+     ok_button.connect("clicked", self.ok_preferences_dialog)
+ 
+   def ok_preferences_dialog(self, widget):
+-    time_changed_widget = self.preferences_dialog.get_widget("preferences_dialog_spin_button_time")
+-    random_order_widget = self.preferences_dialog.get_widget("preferences_dialog_show_wallpaper_random_order")
+-    changing_workspace_widget = self.preferences_dialog.get_widget("preferences_dialog_change_wallpaper_changing_workspace")
+-    style_widget = self.preferences_dialog.get_widget("preferences_dialog_style_combobox")
+-    size_widget = self.preferences_dialog.get_widget("preferences_dialog_size_combobox")
+-    preferences_dialog_widget = self.preferences_dialog.get_widget("preferences_dialog")
++    time_changed_widget = self.preferences_dialog.get_object("preferences_dialog_spin_button_time")
++    random_order_widget = self.preferences_dialog.get_object("preferences_dialog_show_wallpaper_random_order")
++    changing_workspace_widget = self.preferences_dialog.get_object("preferences_dialog_change_wallpaper_changing_workspace")
++    style_widget = self.preferences_dialog.get_object("preferences_dialog_style_combobox")
++    size_widget = self.preferences_dialog.get_object("preferences_dialog_size_combobox")
++    preferences_dialog_widget = self.preferences_dialog.get_object("preferences_dialog")
+ 
+     # user change option for changing_workspace
+     if changing_workspace_widget.get_active():
+@@ -508,10 +527,17 @@ class Wallpapoz:
+     if iter == None:
+       return
+ 
+-    choose_directory_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "add_wallpapers_directory_dialog", APP)
+-    choose_directory_dialog_widget = choose_directory_dialog.get_widget("add_wallpapers_directory_dialog")
+-    filechooser_widget = choose_directory_dialog.get_widget("filechooserwidget")
+-    recursive_widget = choose_directory_dialog.get_widget("recursive_checkbutton")
++    #choose_directory_dialog = gtk.glade.XML(self.wallpapoz_glade_file, "add_wallpapers_directory_dialog", APP)
++    self.choose_directory_dialog_file = "../share/wallpapoz/glade/wallpapoz-builder-add_wallpapers_directory_dialog.glade"
++    self.choose_directory_dialog_builder = gtk.Builder()
++    self.choose_directory_dialog_builder.set_translation_domain(APP)
++    self.choose_directory_dialog_builder.add_from_file(self.choose_directory_dialog_file)
++    # FIXME
++    choose_directory_dialog = self.choose_directory_dialog_builder
++
++    choose_directory_dialog_widget = choose_directory_dialog.get_object("add_wallpapers_directory_dialog")
++    filechooser_widget = choose_directory_dialog.get_object("filechooserwidget")
++    recursive_widget = choose_directory_dialog.get_object("recursive_checkbutton")
+ 
+     # set it to last directory
+     if self.last_directory == None:
+@@ -528,7 +554,7 @@ class Wallpapoz:
+ 
+     dic = { "on_cancel_add_wallpapers_directory_button_clicked" : (self.cancel_button_add_wallpapers_directory, choose_directory_dialog_widget),
+             "on_add_wallpapers_directory_button_clicked" : (self.ok_button_add_wallpapers_directory, filechooser_widget, recursive_widget, choose_directory_dialog_widget, iter) }
+-    choose_directory_dialog.signal_autoconnect(dic)
++    choose_directory_dialog.connect_signals(dic)
+ 
+   # ok, if we choose the directory ( accept filechooser, recursive checkbutton, iter pointing treenode ), function add_wallpapers_directory call this function
+   def ok_button_add_wallpapers_directory(self, widget, filechooser_widget, recursive_widget, choose_directory_dialog_widget, iter):
+@@ -735,7 +761,7 @@ class Wallpapoz:
+         ii = ii + 1
+ 
+       # enable rename workspace menu
+-      self.main_window.get_widget("rename_workspace").set_sensitive(True)
++      self.builder.get_object("rename_workspace").set_sensitive(True)
+ 
+       # name of our left column
+       left_tvcolumn_name = _("Workspace")
+@@ -746,12 +772,12 @@ class Wallpapoz:
+       self.store = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_BOOLEAN)
+ 
+       # disable cut, copy, paste, rename menu item
+-      self.main_window.get_widget("cut").set_sensitive(False)
+-      self.main_window.get_widget("copy").set_sensitive(False)
+-      self.main_window.get_widget("paste").set_sensitive(False)
++      self.builder.get_object("cut").set_sensitive(False)
++      self.builder.get_object("copy").set_sensitive(False)
++      self.builder.get_object("paste").set_sensitive(False)
+ 
+       # enable change wallpaper menu item
+-      self.main_window.get_widget("change_wallpaper").set_sensitive(True)
++      self.builder.get_object("change_wallpaper").set_sensitive(True)
+ 
+       # make the wallpaper list
+       for i in range(len(worklist)):
+@@ -786,7 +812,7 @@ class Wallpapoz:
+ 
+     # set mode to multiple selection
+     self.treeselection = self.treeview_widget.get_selection()
+-    self.treeselection.set_mode(gtk.SELECTION_MULTIPLE)
++    self.treeselection.set_mode(gtk.SelectionMode.MULTIPLE)
+     self.treeselection.select_path(0)
+ 
+     # show image for liststore
+@@ -814,7 +840,7 @@ class Wallpapoz:
+     # status, copy or cut
+     self.work_on_tree = "copy"
+     # enable the paste menu item
+-    self.main_window.get_widget("paste").set_sensitive(True)
++    self.builder.get_object("paste").set_sensitive(True)
+ 
+   # we call this method when we click cut menu action
+   def cut_treenode(self, widget):
+@@ -829,7 +855,7 @@ class Wallpapoz:
+     # status, copy or cut
+     self.work_on_tree = "cut"
+     # enable the paste menu item
+-    self.main_window.get_widget("paste").set_sensitive(True)
++    self.builder.get_object("paste").set_sensitive(True)
+ 
+   # helper function for reordering node after cut&paste, returning list of all lowest not selected iter from the related workspace
+   def reordering_node_after_cut_and_paste(self, copy_iter_list):
+@@ -942,10 +968,10 @@ class Wallpapoz:
+     parent_number = self.store.get_path(self.selected_iter[0])[0]
+     for single_iter in self.selected_iter:
+       if self.store.get_path(single_iter)[0] != parent_number:
+-	temp_iter_list = []
+-	parent_number = self.store.get_path(single_iter)[0]
+-      temp_iter_list.append(single_iter)
+-      prev_iter = single_iter
++        temp_iter_list = []
++        parent_number = self.store.get_path(single_iter)[0]
++        temp_iter_list.append(single_iter)
++        prev_iter = single_iter
+ 
+     # do the remaining job
+     if self.store.iter_n_children( self.store.iter_parent(prev_iter) ) == len(temp_iter_list) and self.work_on_tree == "cut":
+@@ -990,7 +1016,7 @@ class Wallpapoz:
+       # make sure the status is reset
+       self.work_on_tree = None
+       # disable the paste menu item
+-      self.main_window.get_widget("paste").set_sensitive(False)
++      self.builder.get_object("paste").set_sensitive(False)
+ 
+       self.cut_and_reordering_treeiter()
+ 
+@@ -1001,7 +1027,7 @@ class Wallpapoz:
+     # workaround for the case that trying to remove a wallpaper from
+     # the workspace where only one wallpaper exists
+     if not lowest_iter_list:
+-	return
++      return
+ 
+     # iterate to cut ( really!!! ) the iter from selected iter list
+     for single_iter in self.selected_iter:
+@@ -1212,7 +1238,7 @@ class Wallpapoz:
+     # make the chooser dialog
+     filechooser_dialog = self.make_chooser_dialog("change")
+     # if user okay with his choice, then change the value
+-    if filechooser_dialog.run() == gtk.RESPONSE_OK:
++    if filechooser_dialog.run() == gtk.ResponseType.OK:
+       # we interested in image file
+       if self.is_image_file(filechooser_dialog.get_filename()):
+         self.store.set_value(iter, 1, filechooser_dialog.get_filename())
+@@ -1235,15 +1261,15 @@ class Wallpapoz:
+ 
+     if not position_iter:
+       # Nothing is selected, unfortunately this can happen
+-      self.main_window.get_widget("rename_workspace").set_sensitive(False)
++      self.builder.get_object("rename_workspace").set_sensitive(False)
+       self.rename_workspace_menu.set_sensitive(False)
+-      self.main_window.get_widget("change_wallpaper").set_sensitive(False)
++      self.builder.get_object("change_wallpaper").set_sensitive(False)
+       self.change_wallpaper_menu.set_sensitive(False)
+-      self.main_window.get_widget("cut").set_sensitive(False)
++      self.builder.get_object("cut").set_sensitive(False)
+       self.cut_menu.set_sensitive(False)
+-      self.main_window.get_widget("copy").set_sensitive(False)
++      self.builder.get_object("copy").set_sensitive(False)
+       self.copy_menu.set_sensitive(False)
+-      self.main_window.get_widget("delete_wallpapers").set_sensitive(False)
++      self.builder.get_object("delete_wallpapers").set_sensitive(False)
+       self.delete_wallpapers_menu.set_sensitive(False)
+       # Nothing left
+       return
+@@ -1255,13 +1281,13 @@ class Wallpapoz:
+ 
+       # child node
+       if parent != None:
+-        self.main_window.get_widget("rename_workspace").set_sensitive(False)
++        self.builder.get_object("rename_workspace").set_sensitive(False)
+         self.rename_workspace_menu.set_sensitive(False)
+-        self.main_window.get_widget("change_wallpaper").set_sensitive(True)
++        self.builder.get_object("change_wallpaper").set_sensitive(True)
+         self.change_wallpaper_menu.set_sensitive(True)
+-        self.main_window.get_widget("cut").set_sensitive(True)
++        self.builder.get_object("cut").set_sensitive(True)
+         self.cut_menu.set_sensitive(True)
+-        self.main_window.get_widget("copy").set_sensitive(True)
++        self.builder.get_object("copy").set_sensitive(True)
+         self.copy_menu.set_sensitive(True)
+ 
+         # See create_configuration_file
+@@ -1272,23 +1298,23 @@ class Wallpapoz:
+         # Only show "Delete wallpapers" menu if there are at least 2 wallpapers
+         # in a workspace
+         if childiter:
+-          self.main_window.get_widget("delete_wallpapers").set_sensitive(True)
++          self.builder.get_object("delete_wallpapers").set_sensitive(True)
+           self.delete_wallpapers_menu.set_sensitive(True)
+         else:
+-          self.main_window.get_widget("delete_wallpapers").set_sensitive(False)
++          self.builder.get_object("delete_wallpapers").set_sensitive(False)
+           self.delete_wallpapers_menu.set_sensitive(False)
+ 
+       # parent node
+       else:
+-        self.main_window.get_widget("rename_workspace").set_sensitive(True)
++        self.builder.get_object("rename_workspace").set_sensitive(True)
+         self.rename_workspace_menu.set_sensitive(True)
+-        self.main_window.get_widget("change_wallpaper").set_sensitive(False)
++        self.builder.get_object("change_wallpaper").set_sensitive(False)
+         self.change_wallpaper_menu.set_sensitive(False)
+-        self.main_window.get_widget("cut").set_sensitive(False)
++        self.builder.get_object("cut").set_sensitive(False)
+         self.cut_menu.set_sensitive(False)
+-        self.main_window.get_widget("copy").set_sensitive(False)
++        self.builder.get_object("copy").set_sensitive(False)
+         self.copy_menu.set_sensitive(False)
+-        self.main_window.get_widget("delete_wallpapers").set_sensitive(False)
++        self.builder.get_object("delete_wallpapers").set_sensitive(False)
+         self.delete_wallpapers_menu.set_sensitive(False)
+ 
+     filename = self.store.get_value(position_iter, 1)
+@@ -1297,19 +1323,19 @@ class Wallpapoz:
+     # files' list (i.e. not pointing to desktop name)
+     if ( (type(self.store) == gtk.TreeStore) and
+ 	( parent == None ) ):
+-	self.image_widget.clear()
++      self.image_widget.clear()
+     else:
+-     from glib import GError as glib_GError
++     from gi.repository.GLib import GError as glib_GError
+      try:
+-      anime = gtk.gdk.PixbufAnimation(filename)
++      anime = GdkPixbuf.PixbufAnimation.new_from_file(filename)
+ 
+       if anime.is_static_image() :
+         im = Image.open(filename)
+         # keep image proportions
+         if im.size[0] > im.size[1]:
+-          self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
++          self.image_widget.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file_at_size(filename, 400, int((float(im.size[1])/im.size[0]) * 400)))
+         else:
+-          self.image_widget.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
++          self.image_widget.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file_at_size(filename, int(float(im.size[1])/im.size[0] * 300), 300))
+ 
+       else:
+         width = anime.get_width()
+@@ -1322,8 +1348,8 @@ class Wallpapoz:
+ 
+      except IOError:
+       self.image_widget.clear()
+-     except glib_GError, (msg):
+-      print msg
++     except glib_GError as msg:
++      print (msg)
+       self.image_widget.clear()
+ 
+     # display image filename
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 09d1a09..15163d7 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		9
+%define         fedorarel		9.100
 
 %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
 
 License:        GPLv2+
@@ -27,6 +27,14 @@ Source11:       wallpapoz-autostart.desktop
 # fix 584980, 597687?
 # and 711541
 Source12:	daemon_wallpapoz-wrapper
+#
+# Glade XML converted to GTK builder script
+Source21:	wallpapoz-0.6.2-builder.tar.bz2
+# Source21 is generated by the following script.
+# Note that the following script uses "gtk-builder-convert" in gtk2-devel, which is currently written
+# in python2, so we generate Source21 beforehand
+Source22:	wallpapoz-glade-builder-convert.sh
+#
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
 Patch0:         wallpapoz-0.6.1-workspace-num-respawn.patch
@@ -83,14 +91,17 @@ Patch17:	wallpapoz-0.6.2-MATE.patch
 # Support CINNAMON
 # https://bugzilla.redhat.com/show_bug.cgi?id=1029554#c44
 Patch18:	wallpapoz-0.6.2-CINNAMON.patch
+# Switch to python3
+Patch31:	wallpapoz-0.6.2-python3.patch
 
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  python2-devel
-BuildRequires:  pygtk2-libglade
-BuildRequires:  python2-imaging
+BuildRequires:  python3-devel
+BuildRequires:  python3-imaging
+BuildRequires:  gtk3
+BuildRequires:  python3-gobject
 #BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
@@ -98,8 +109,9 @@ BuildRequires:  python2-imaging
 %endif
 # Because wallpapoz uses gconftool-2 or so
 Requires:       GConf2
-Requires:       pygtk2-libglade
-Requires:       python2-imaging
+Requires:       gtk3
+Requires:       python3-gobject
+Requires:       python3-imaging
 #Requires:       gnome-python2-gnome
 Requires:       xorg-x11-utils
 Requires:       %{_bindir}/kill
@@ -110,7 +122,7 @@ This tool enables your Gnome desktop to have different
 wallpapers for different workspaces or virtual desktops.
 
 %prep
-%setup -q -n %{name}-%{version}%{?svnver:-%svnver}
+%setup -q -n %{name}-%{version}%{?svnver:-%svnver} -a 21
 %patch0 -p1 -b .respawn
 %patch2 -p1 -b .dircheck
 %patch3 -p1 -b .noitem
@@ -136,6 +148,8 @@ grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
 grep -rl --null '/usr/bin/env python$' . | \
 	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
 
+%patch31 -p1 -b .py3
+
 # For setup
 mkdir TMPBINDIR
 pushd TMPBINDIR
@@ -152,7 +166,7 @@ ln -sf c share/gnome/help/wallpapoz/C
 %{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
 
 export PATH=$(pwd)/TMPBINDIR:$PATH
-%{__python2} setup.py install --installdir=$RPM_BUILD_ROOT%{_prefix}
+%{__python3} setup.py install --installdir=$RPM_BUILD_ROOT%{_prefix}
 
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -182,6 +196,11 @@ popd
 # is not needed
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 
+# Manually install the following
+install -cpm 0644  \
+	wallpapoz-*/share/wallpapoz/glade/*builder*glade \
+	%{buildroot}%{_datadir}/%{name}/glade/
+
 %{find_lang} %{name}
 
 %files -f %{name}.lang
@@ -201,6 +220,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Mon Sep  2 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-10
+- Switch to python3
+
 * Sun Sep  1 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-8.1
 - Escape white spaces in wallpaper name properly
 

From 541f19b6565f0dcfb583a439f6fbdf6fd66900e4 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 2 Sep 2019 15:20:56 +0900
Subject: [PATCH 40/57] bump release

---
 wallpapoz.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 15163d7..8be730e 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		9.100
+%define         fedorarel		10
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 

From d654987faa331579783d60407255e3d57db5ed9b Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Thu, 28 Nov 2019 13:58:10 +0900
Subject: [PATCH 41/57] bug 1773214 and etc, various fixes for "desktop" type
 xml

---
 wallpapoz-0.6.2-python3-desktop-type.patch | 114 +++++++++++++++++++++
 wallpapoz.spec                             |   8 +-
 2 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 wallpapoz-0.6.2-python3-desktop-type.patch

diff --git a/wallpapoz-0.6.2-python3-desktop-type.patch b/wallpapoz-0.6.2-python3-desktop-type.patch
new file mode 100644
index 0000000..5530f16
--- /dev/null
+++ b/wallpapoz-0.6.2-python3-desktop-type.patch
@@ -0,0 +1,114 @@
+--- wallpapoz-0.6.2/src/wallpapoz.py3.01	2019-11-25 15:36:39.502763400 +0900
++++ wallpapoz-0.6.2/src/wallpapoz	2019-11-28 13:16:27.404156561 +0900
+@@ -220,7 +220,7 @@
+   def get_selected_iter_of_treeview(self, type_selection):
+ 
+     # treeselection give 2-tuple.... ( model, path )
+-    pathlist = self.treeselection.get_selected_rows()[1]
++    model, pathlist = self.treeselection.get_selected_rows()
+ 
+     # how many of selection do we have
+     length_of_path_list = len(pathlist)
+@@ -883,7 +883,14 @@
+     for copy_iter in copy_iter_list:
+ 
+       # get the parent and child number
+-      copy_iter_parent_number, copy_iter_child_number = self.store.get_path(copy_iter)
++      if type(self.store) == gtk.TreeStore:
++        copy_iter_parent_number, copy_iter_child_number = self.store.get_path(copy_iter)
++      elif type(self.store) == gtk.ListStore:
++        # "desktop" type xml, workaround
++        copy_iter_child_number = self.store.get_path(copy_iter)[0]
++        copy_iter_parent_number = 0
++      else:
++        raise
+ 
+       # we are in new workspace
+       if copy_iter_parent_number != parent_number_index:
+@@ -931,7 +938,11 @@
+           # it is not in the same block but still in the same workspace
+           else:
+ 
+-            lowest_iter_list.append(
++            if type(self.store) == gtk.ListStore:
++              lowest_iter_list.append(
++                self.store.get_iter(iter_workspace_index+1))
++            else:
++              lowest_iter_list.append(
+                 self.store.get_iter( (copy_iter_parent_number, iter_workspace_index+1) ) )
+ 
+             done_workspace = True
+@@ -943,8 +954,13 @@
+       # a wallpaper from a workspace, if only one wallpaper existed.
+       # Need further investigation, however anyway workaround...
+       new_iter = []
++      if type(self.store) == gtk.ListStore:
++        parent_number_index = 0
+       try:
+-        new_iter = self.store.get_iter((parent_number_index, iter_workspace_index + 1))
++        if type(self.store) == gtk.ListStore:
++          new_iter = self.store.get_iter(iter_workspace_index + 1)
++        else:
++          new_iter = self.store.get_iter((parent_number_index, iter_workspace_index + 1))
+       except ValueError:
+         pass
+       if new_iter:
+@@ -970,8 +986,8 @@
+       if self.store.get_path(single_iter)[0] != parent_number:
+         temp_iter_list = []
+         parent_number = self.store.get_path(single_iter)[0]
+-        temp_iter_list.append(single_iter)
+-        prev_iter = single_iter
++      temp_iter_list.append(single_iter)
++      prev_iter = single_iter
+ 
+     # do the remaining job
+     if self.store.iter_n_children( self.store.iter_parent(prev_iter) ) == len(temp_iter_list) and self.work_on_tree == "cut":
+@@ -986,11 +1002,17 @@
+     #   if type(self.store) == gtk.TreeStore:
+     parent = self.store.iter_parent(position_iter)
+     new_index = self.store.get_value(position_iter, 0) + 1
+-    # if it is child node
+-    if parent != None:
++
++    # if it is child node in "workspace" xml or "desktop" type xml
++    if (type(self.store) == gtk.ListStore) or (parent != None):
+       for single_iter in self.selected_iter:
+         node_value = self.store.get_value(single_iter, 1)
+-        position_iter = self.store.insert_after(parent, position_iter, [new_index, node_value, False])
++        if type(self.store) == gtk.ListStore:
++          # desktop type
++          position_iter = self.store.insert_after(position_iter, [new_index, node_value, False])
++        else:
++          # child node in workspace xml
++          position_iter = self.store.insert_after(parent, position_iter, [new_index, node_value, False])
+         new_index = new_index + 1
+ 
+       # after inserting new row, we must sort out the index number after it
+@@ -1108,6 +1130,7 @@
+       self.order_treeiter_from_lowest_iter(lowest_iter)
+ 
+     # select something after deleting treenodes
++    self.treeselection.unselect_all()
+     self.treeselection.select_path(0)
+ 
+   # create configuration file ( we call this method when we click save button )
+@@ -1274,6 +1297,18 @@
+       # Nothing left
+       return
+ 
++    if type(self.store) == gtk.ListStore:
++      #self.builder.get_object("rename_workspace").set_sensitive(False)
++      #self.rename_workspace_menu.set_sensitive(False)
++      self.builder.get_object("change_wallpaper").set_sensitive(True)
++      self.change_wallpaper_menu.set_sensitive(True)
++      self.builder.get_object("cut").set_sensitive(True)
++      self.cut_menu.set_sensitive(True)
++      self.builder.get_object("copy").set_sensitive(True)
++      self.copy_menu.set_sensitive(True)
++      self.builder.get_object("delete_wallpapers").set_sensitive(True)
++      self.delete_wallpapers_menu.set_sensitive(True)
++
+     if type(self.store) == gtk.TreeStore:
+       parent = self.store.iter_parent(position_iter)
+       # parent node, enable: rename_workspace
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 8be730e..0d07364 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		10
+%define         fedorarel		11
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -93,6 +93,8 @@ Patch17:	wallpapoz-0.6.2-MATE.patch
 Patch18:	wallpapoz-0.6.2-CINNAMON.patch
 # Switch to python3
 Patch31:	wallpapoz-0.6.2-python3.patch
+# bug 1773214 and etc, various fixes for "desktop" type xml
+Patch32:	wallpapoz-0.6.2-python3-desktop-type.patch
 
 BuildArch:      noarch
 
@@ -149,6 +151,7 @@ grep -rl --null '/usr/bin/env python$' . | \
 	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
 
 %patch31 -p1 -b .py3
+%patch32 -p1 -b .py3.desktop
 
 # For setup
 mkdir TMPBINDIR
@@ -220,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Thu Nov 28 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-11
+- bug 1773214 and etc, various fixes for "desktop" type xml
+
 * Mon Sep  2 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-10
 - Switch to python3
 

From d7dfd1446e189e95a6f45b677ebc4d3eb30d2a47 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 03:28:30 +0000
Subject: [PATCH 42/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 0d07364..1fed263 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-11.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Nov 28 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-11
 - bug 1773214 and etc, various fixes for "desktop" type xml
 

From 547ab2d6dc58d43da6b6b0e46c76b625fb7820f8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 28 Jul 2020 14:18:46 -0400
Subject: [PATCH 43/57] Require xprop xwininfo, not xorg-x11-utils

---
 wallpapoz.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 1fed263..9fbf35d 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		11
+%define         fedorarel		12
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -115,7 +115,7 @@ Requires:       gtk3
 Requires:       python3-gobject
 Requires:       python3-imaging
 #Requires:       gnome-python2-gnome
-Requires:       xorg-x11-utils
+Requires:       xprop xwininfo
 Requires:       %{_bindir}/kill
 Requires:       %{_bindir}/pgrep
 
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 0.6.2-12.1
+- Require xprop xwininfo, not xorg-x11-utils
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-11.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 2c3db6c2055902ac1fcd92b8f8f248974871ebc0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 23:19:00 +0000
Subject: [PATCH 44/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 9fbf35d..b67d913 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}.2
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 0.6.2-12.1
 - Require xprop xwininfo, not xorg-x11-utils
 

From cd6bd9e0102f1f4c78ece3893944f9c7301b54df Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:44:54 +0000
Subject: [PATCH 45/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index b67d913..bad1219 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.2
+Release:        %{rel}%{?dist}.3
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 25ca2c583d6a238b1bc3d9be6121a88e5c475f64 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Fri, 5 Nov 2021 15:45:58 +0900
Subject: [PATCH 46/57] Use python3-ported gtk-builder-convert in build time
 instead of

  glade files generated preliminarily
---
 sources                            |  1 -
 wallpapoz-glade-builder-convert.sh |  1 +
 wallpapoz.spec                     | 24 ++++++++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sources b/sources
index 2ca14fd..cd46ad5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 SHA512 (wallpapoz-0.6.2.tar.bz2) = 36ed198ba72e08f33ed92dca173f41eb7e7d307366ad42b7cfac2659511f42980351eeb4c02f155469fdf75be79fad37d77bb02118ad91f39da22dae5246860b
-SHA512 (wallpapoz-0.6.2-builder.tar.bz2) = a1e567ca0fa5dde9ba1eb0d143c1618789fc6fff50e09390ea8edde2afd8cdf5d9e95ace8e287a3791766f5a2369717e1a3a81c17a7197c04cc988d6d0a89346
diff --git a/wallpapoz-glade-builder-convert.sh b/wallpapoz-glade-builder-convert.sh
index 5d170cf..57e0fab 100644
--- a/wallpapoz-glade-builder-convert.sh
+++ b/wallpapoz-glade-builder-convert.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/bash
 set -x
+set -e
 
 ORIG_XML=./share/wallpapoz/glade/wallpapoz.glade
 NEWTOPDIR=wallpapoz-0.6.2-builder
diff --git a/wallpapoz.spec b/wallpapoz.spec
index bad1219..0b619cf 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,13 +8,13 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		12
+%define         fedorarel		13
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.3
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -29,10 +29,10 @@ Source11:       wallpapoz-autostart.desktop
 Source12:	daemon_wallpapoz-wrapper
 #
 # Glade XML converted to GTK builder script
-Source21:	wallpapoz-0.6.2-builder.tar.bz2
+# Source21:	wallpapoz-0.6.2-builder.tar.bz2
 # Source21 is generated by the following script.
-# Note that the following script uses "gtk-builder-convert" in gtk2-devel, which is currently written
-# in python2, so we generate Source21 beforehand
+# Note that the following script uses "gtk-builder-convert" in gtk2-devel
+# Now "gtk-builder-convert" is imported to python3, so don't use Source21
 Source22:	wallpapoz-glade-builder-convert.sh
 #
 # Misc fixes for daemon_wallpapoz under compiz working,
@@ -104,6 +104,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-imaging
 BuildRequires:  gtk3
 BuildRequires:  python3-gobject
+BuildRequires:  %{_bindir}/gtk-builder-convert
 #BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
@@ -124,7 +125,7 @@ This tool enables your Gnome desktop to have different
 wallpapers for different workspaces or virtual desktops.
 
 %prep
-%setup -q -n %{name}-%{version}%{?svnver:-%svnver} -a 21
+%setup -q -n %{name}-%{version}%{?svnver:-%svnver}
 %patch0 -p1 -b .respawn
 %patch2 -p1 -b .dircheck
 %patch3 -p1 -b .noitem
@@ -143,10 +144,6 @@ wallpapers for different workspaces or virtual desktops.
 %patch17 -p1 -b .MATE
 %patch18 -p1 -b .CINNAMON
 
-# Umm... permission fix
-find . -type f -print0 | xargs -0 chmod 0644
-grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
-
 grep -rl --null '/usr/bin/env python$' . | \
 	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
 
@@ -163,6 +160,9 @@ popd
 ln -sf c share/gnome/help/wallpapoz/C
 
 %build
+bash %{SOURCE22}
+find . -type f -print0 | xargs -0 chmod 0644
+grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -223,6 +223,10 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Nov  5 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-13
+- Use python3-ported gtk-builder-convert in build time instead of
+  glade files generated preliminarily
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From f32b153154a8ccf11f1f406a10f3c77c7c4f01fd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 04:15:38 +0000
Subject: [PATCH 47/57] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 0b619cf..8bbd2bb 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}
+Release:        %{rel}%{?dist}.1
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Nov  5 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-13
 - Use python3-ported gtk-builder-convert in build time instead of
   glade files generated preliminarily

From c008620bfce658b752919fc6c4e98825f94797a9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 12:11:40 +0000
Subject: [PATCH 48/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 8bbd2bb..f10122e 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}.2
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 4c3eea0aaf0c9b5f0d54e16e0cad251472589286 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:35:18 +0000
Subject: [PATCH 49/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index f10122e..001fe0c 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -14,7 +14,7 @@
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.2
+Release:        %{rel}%{?dist}.3
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 License:        GPLv2+
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 7e47f87b449faef02e9ced3c142761a99769002e Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 13 Mar 2023 10:44:43 +0900
Subject: [PATCH 50/57] rename release macro to make rpmdev-bumprelease work

---
 wallpapoz.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 001fe0c..92e7049 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,9 +8,9 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel		13
+%define         baserelease		13
 
-%define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
+%define         rel             %{?betaver:0.}%{baserelease}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}

From 8434cc59b79b834fcd30b6992a1a40a8a41313e1 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sun, 23 Jul 2023 00:53:08 +0900
Subject: [PATCH 51/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 92e7049..f9645da 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         baserelease		13
+%define         baserelease		14
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -223,6 +223,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-14.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 0e784d04df3eeb6afaff0eaad0854774127878e1 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Tue, 21 Nov 2023 17:53:28 +0900
Subject: [PATCH 52/57] Clean up release number and some spec file stuff

SPDX migration
---
 wallpapoz.spec | 87 +++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index f9645da..634669f 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,33 +7,34 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-#%%define         svnver          svn92_trunk
-%define         baserelease		14
+%define         baserelease		15
 
-%define         rel             %{?betaver:0.}%{baserelease}%{?svnver:.%svnver}%{?betaver:.%betaver}
+%define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.3
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
-License:        GPLv2+
+# GPL-2.0-or-later    README
+# GFDL-1.1-or-later   share/gnome/help/wallpapoz/C/legal.xml
+# SPDX confirmed
+License:        GPL-2.0-or-later AND GFDL-1.1-or-later
+
 URL:            http://vajrasky.wordpress.com/wallpapoz/
-Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
-%if 0%{?fedora} >= 12
+Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?betaver:%betaver}.tar.bz2
 Source11:       wallpapoz-autostart.desktop
-%endif
 # Install daemon_wallpapoz wrapper script, which may
 # fix 584980, 597687?
 # and 711541
-Source12:	daemon_wallpapoz-wrapper
+Source12:       daemon_wallpapoz-wrapper
 #
 # Glade XML converted to GTK builder script
 # Source21:	wallpapoz-0.6.2-builder.tar.bz2
 # Source21 is generated by the following script.
 # Note that the following script uses "gtk-builder-convert" in gtk2-devel
 # Now "gtk-builder-convert" is imported to python3, so don't use Source21
-Source22:	wallpapoz-glade-builder-convert.sh
+Source22:       wallpapoz-glade-builder-convert.sh
 #
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
@@ -104,7 +105,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-imaging
 BuildRequires:  gtk3
 BuildRequires:  python3-gobject
-BuildRequires:  %{_bindir}/gtk-builder-convert
+BuildRequires:  /usr/bin/gtk-builder-convert
 #BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
@@ -117,8 +118,8 @@ Requires:       python3-gobject
 Requires:       python3-imaging
 #Requires:       gnome-python2-gnome
 Requires:       xprop xwininfo
-Requires:       %{_bindir}/kill
-Requires:       %{_bindir}/pgrep
+Requires:       /usr/bin/kill
+Requires:       /usr/bin/pgrep
 
 %description
 This tool enables your Gnome desktop to have different 
@@ -126,29 +127,29 @@ wallpapers for different workspaces or virtual desktops.
 
 %prep
 %setup -q -n %{name}-%{version}%{?svnver:-%svnver}
-%patch0 -p1 -b .respawn
-%patch2 -p1 -b .dircheck
-%patch3 -p1 -b .noitem
-%patch4 -p1 -b .patch_init
-%patch5 -p1 -b .kill_nox
-%patch6 -p1 -b .kill_multi
-%patch7 -p1 -b .anime
-%patch8 -p1 -b .nonutf8
-%patch9 -p1 -b .deletelastone
-%patch10 -p1 -b .deletefirst
-%patch12 -p1 -b .workspace_img
-%patch13 -p1 -b .workspace_num_incr
-%patch14 -p1 -b .default
-%patch15 -p1 -b .pil
-%patch16 -p1 -b .LXDE
-%patch17 -p1 -b .MATE
-%patch18 -p1 -b .CINNAMON
+%patch -P0 -p1 -b .respawn
+%patch -P2 -p1 -b .dircheck
+%patch -P3 -p1 -b .noitem
+%patch -P4 -p1 -b .patch_init
+%patch -P5 -p1 -b .kill_nox
+%patch -P6 -p1 -b .kill_multi
+%patch -P7 -p1 -b .anime
+%patch -P8 -p1 -b .nonutf8
+%patch -P9 -p1 -b .deletelastone
+%patch -P10 -p1 -b .deletefirst
+%patch -P12 -p1 -b .workspace_img
+%patch -P13 -p1 -b .workspace_num_incr
+%patch -P14 -p1 -b .default
+%patch -P15 -p1 -b .pil
+%patch -P16 -p1 -b .LXDE
+%patch -P17 -p1 -b .MATE
+%patch -P18 -p1 -b .CINNAMON
 
 grep -rl --null '/usr/bin/env python$' . | \
 	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
 
-%patch31 -p1 -b .py3
-%patch32 -p1 -b .py3.desktop
+%patch -P31 -p1 -b .py3
+%patch -P32 -p1 -b .py3.desktop
 
 # For setup
 mkdir TMPBINDIR
@@ -174,20 +175,15 @@ export PATH=$(pwd)/TMPBINDIR:$PATH
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
-%if 0%{?fedora} < 19
-   --vendor fedora \
-%endif
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # Install desktop application autostart stuff
-%if 0%{?fedora} >= 12
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 desktop-file-install \
 	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
 	%{SOURCE11}
-%endif
 
 # Install daemon_wallpapoz wrapper script
 pushd ${RPM_BUILD_ROOT}
@@ -207,22 +203,27 @@ install -cpm 0644  \
 %{find_lang} %{name}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_bindir}/*%{name}
+%license COPYING
+%doc     README
+%{_bindir}/%{name}
+%{_bindir}/daemon_wallpapoz
 %{_libexecdir}/daemon_wallpapoz
 
-%if 0%{?fedora} >= 12
 %{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
-%endif
 
-%{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/glade/
+%{_datadir}/%{name}/lib/
 %{_datadir}/gnome/help/%{name}/
 
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Tue Nov 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-15
+- Clean up release number and some spec file stuff
+- SPDX migration
+
 * Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-14.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 5e312333fc23a72d5476be160cfaf594bf448588 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 08:21:34 +0000
Subject: [PATCH 53/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 634669f..27ff76a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,7 +7,7 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-%define         baserelease		15
+%define         baserelease		16
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
@@ -220,6 +220,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Nov 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-15
 - Clean up release number and some spec file stuff
 - SPDX migration

From b3b196f3218ded5509312d31c1ea524d6927afff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 09:06:32 +0000
Subject: [PATCH 54/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 27ff76a..d1a2c3a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,7 +7,7 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-%define         baserelease		16
+%define         baserelease		17
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
@@ -220,6 +220,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e46b356566c3c1275129a797efd138ac92c9ae66 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 14:44:15 +0000
Subject: [PATCH 55/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index d1a2c3a..16a028a 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,7 +7,7 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-%define         baserelease		17
+%define         baserelease		18
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
@@ -220,6 +220,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From cbf5d2e84d6a7b70be5040e3cc0676b9196a6007 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:16:51 +0000
Subject: [PATCH 56/57] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 wallpapoz.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 16a028a..942dd68 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,7 +7,7 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-%define         baserelease		18
+%define         baserelease		19
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
@@ -220,6 +220,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 8ec5f94891f32fa843b67d790a4c5b2a7e698842 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sat, 8 Nov 2025 22:34:42 +0900
Subject: [PATCH 57/57] Add dep for gobject-introspection explicitly

---
 wallpapoz.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wallpapoz.spec b/wallpapoz.spec
index 942dd68..02a5901 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -7,7 +7,7 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-%define         baserelease		19
+%define         baserelease		20
 
 %define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
@@ -101,6 +101,7 @@ BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
+BuildRequires:  gobject-introspection
 BuildRequires:  python3-devel
 BuildRequires:  python3-imaging
 BuildRequires:  gtk3
@@ -114,6 +115,7 @@ BuildRequires:  /usr/bin/gtk-builder-convert
 # Because wallpapoz uses gconftool-2 or so
 Requires:       GConf2
 Requires:       gtk3
+Requires:       gobject-introspection
 Requires:       python3-gobject
 Requires:       python3-imaging
 #Requires:       gnome-python2-gnome
@@ -220,6 +222,9 @@ install -cpm 0644  \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Nov 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-20
+- Add dep for gobject-introspection explicitly
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild