[gdesklets/f16: 4/4] add patch addressing memory leak

[Luya Tshimbalanga]

commit d4be154c06e4a86ed18e5202b5408c7cfb4340a3
Merge: 67da1b3 a1eb553
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sat Apr 7 21:30:13 2012 -0700

    add patch addressing memory leak

 gdesklets-0.36.3-2.fc16.src.rpm |  Bin 0 -> 3757675 bytes
 gdesklets-desktop.patch         |   28 ++++++++++++++++++++++++
 gdesklets.spec                  |   45 +++++++++++++++++++++++++++-----------
 3 files changed, 60 insertions(+), 13 deletions(-)
---
diff --cc gdesklets.spec
index 0273fbb,6bb15fc..2f6edcb
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@@ -1,22 -1,21 +1,32 @@@
  #%define alphatag beta
  
  Name:		gdesklets
++<<<<<<< HEAD
 +Version:	0.36.3
 +Release:	3%{?dist}
 +Summary:	Architecture for desktop applets
++=======
+ Version:		0.36.3
+ Release:		3%{?dist}
+ Summary:		Architecture for desktop applets
++>>>>>>> master
  
  Group:		User Interface/Desktops
- License:	GPL+
+ License:		GPL+
  
- URL:		http://%{name}.de/
- Source0:	http://%{name}.de/files/%{name}-%{version}.tar.bz2
+ URL:			http://%{name}.de/
+ Source0:		http://%{name}.de/files/%{name}-%{version}.tar.bz2
  Patch0:		transition.patch
++<<<<<<< HEAD
 +Patch1:		vfs.patch
 +
++=======
+ Patch1:		gdesklets-desktop.patch
++>>>>>>> master
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 -BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 -BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 +BuildRequires:  python3-devel > 3.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 +BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel   
  BuildRequires:  libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
  BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
  Requires:	gnome-python2-gconf >= 2.6.0
@@@ -33,7 -32,7 +43,11 @@@ bars, weather sensors, news tickers
  %prep
  %setup -q -n %{name}-%{version}
  %patch0 -p1 -b .transition
++<<<<<<< HEAD
 +%patch1 -p0 -b .vfs
++=======
+ %patch1 -p3 -b .gdesklets-desktop
++>>>>>>> master
  
  %build
  %configure \
@@@ -87,9 -84,10 +99,16 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
 +* Sun Dec 05 2011 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-3
 +- Patch for vfs declaration (rhbz#740610)
 +- Added gvfs-devel and python3-devel for BuildRequires
++=======
+ * Tue Mar 20 2012 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-3
+ - Adhered to Fedora guideline for desktop declaration
+ - Ported patch from OpenSuse spec version
+ - Patch addressing memory leak (rhbz #747420, launchpad #190894)
++>>>>>>> master
  
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild