dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wp_tray
-# $Id$
-NAME := wp_tray
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

wp_tray-0.5.3-missingdir.patch

@@ -0,0 +1,37 @@
+--- wp_tray-0.5.3/src/Wallpapers.cc.orig	2007-12-13 22:11:27.000000000 +0100
++++ wp_tray-0.5.3/src/Wallpapers.cc	2007-12-13 22:10:41.000000000 +0100
+@@ -294,6 +294,7 @@
+ {
+ 	fs::directory_iterator itEnd;
+ 
++	try {
+ 	for(fs::directory_iterator it(_pathCurrent); it != itEnd; ++ it)
+ 	{
+ 		try
+@@ -328,7 +329,8 @@
+ 			std::cerr << "Wallpapers::CountEntriesInDirectory() : " << ex.what() << std::endl;
+ 		}// end catch
+ 	}// end for
+-
++	} catch (std::exception& e) {
++	}
+ 	return _nFileCount;
+ }// end Wallpapers::CountDirectoryEntries
+ 
+@@ -357,6 +359,7 @@
+ 		return;
+ 	}// end if
+ 
++	try {
+ 	for(fs::directory_iterator it(_pathCurrent); it != itEnd && _nFileIndex != 0; ++ it)
+ 	{
+ 		try
+@@ -393,6 +396,8 @@
+ 			std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl;
+ 		}// end catch
+ 	}// end for
++	} catch (std::exception& e) {
++	}
+ }// end Wallpapers::GetDirectoryEntryAtIndex
+ 
+ //------------------------------------------------------------------------

wp_tray.spec

@@ -1,6 +1,6 @@
 Name:           wp_tray
 Version:        0.5.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A wallpaper-changing applet for GNOME
 
 Group:          Amusements/Graphics
@@ -10,6 +10,7 @@ Source0:        http://planetearthworm.com/projects/wp_tray/files/%{name}-%{vers
 Patch0:         wp_tray-0.5.3-gnomewp.patch
 Patch1:         wp_tray-0.5.3-notify.patch
 Patch2:         wp_tray-0.5.3-boost.patch
+Patch3:         wp_tray-0.5.3-missingdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext libglademm24-devel libgnomecanvasmm26-devel
@@ -25,6 +26,7 @@ Wallpaper Tray is a GNOME applet used for changing your wallpaper.
 %patch0 -p1 -b .gnomewp
 %patch1 -p1 -b .notify
 %patch2 -p1 -b .boost
+%patch3 -p1 -b .missingdir
 
 %build
 %configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
@@ -69,6 +71,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Thu Dec 13 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-6
+- Added patch to fix missing dir crash
+
 * Fri Aug  3 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-5
 - Changed License field to new guidelines
 - Added patch to support new boost library