From 07c2eae99e72ead211cf991e60917649df1c0047 Mon Sep 17 00:00:00 2001
From: Till Maas <till@fedoraproject.org>
Date: Fri, 15 Jan 2010 08:14:18 +0000
Subject: [PATCH] - Fix SF.net Source0 URL - Fix BTFS bug with patch from
 gentoo:     https://bugzilla.redhat.com/show_bug.cgi?id=538931

---
 recordmydesktop-shmstr.h-to-shmproto.h.patch | 22 ++++++++++++++++++++++
 recordmydesktop.spec                         | 13 +++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 recordmydesktop-shmstr.h-to-shmproto.h.patch

diff --git a/recordmydesktop-shmstr.h-to-shmproto.h.patch b/recordmydesktop-shmstr.h-to-shmproto.h.patch
new file mode 100644
index 0000000..4ed2619
--- /dev/null
+++ b/recordmydesktop-shmstr.h-to-shmproto.h.patch
@@ -0,0 +1,22 @@
+--- recordmydesktop-0.3.8.1/src/rmd_getzpixmap.c	2008-12-13 17:04:10.000000000 +0100
++++ recordmydesktop-0.3.8.1/src/rmd_getzpixmap.c	2009-11-11 11:30:18.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ 
+ 
+--- recordmydesktop-0.3.8.1/src/rmd_update_image.c	2008-12-13 17:20:49.000000000 +0100
++++ recordmydesktop-0.3.8.1/src/rmd_update_image.c	2009-11-11 11:30:34.000000000 +0100
+@@ -32,7 +32,7 @@
+ #include "rmd_types.h"
+ 
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ 
+ 
diff --git a/recordmydesktop.spec b/recordmydesktop.spec
index 2d47725..d7147fd 100644
--- a/recordmydesktop.spec
+++ b/recordmydesktop.spec
@@ -1,12 +1,16 @@
 Name:           recordmydesktop
 Version:        0.3.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Desktop session recorder with audio and video
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://recordmydesktop.iovar.org/
-Source0:        http://dl.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
+# from gentoo: http://bugs.gentoo.org/attachment.cgi?id=209904
+# 2010-01-15: Bug with proposed fix already upstream:
+# http://sourceforge.net/tracker/?func=detail&aid=2889699&group_id=172357&atid=861428
+Patch0:         recordmydesktop-shmstr.h-to-shmproto.h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXdamage-devel, libSM-devel
@@ -27,6 +31,7 @@ exposes the program functionality in a usable way.
 
 %prep
 %setup -q
+%patch0 -p1 -b .shmstr.h-to-shmproto.h
 
 #chmod -x $RPM_BUILD_DIR/%{name}-%{version}/src/load_cache.c \
 #         $RPM_BUILD_DIR/%{name}-%{version}/include/rmdtypes.h \
@@ -52,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 15 2010 Till Maas <opensource@till.name> - 0.3.8.1-3
+- Fix SF.net Source0 URL
+- Fix BTFS bug with patch from gentoo: https://bugzilla.redhat.com/show_bug.cgi?id=538931
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild