[gdesklets/f16] clean up mess

[Luya Tshimbalanga]

commit 003559abfa6e4859bbcf41b22cb80974110386f2
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sun Apr 8 00:08:30 2012 -0700

    clean up mess

 gdesklets-0.36.3-2.fc16.src.rpm |  Bin 3757675 -> 0 bytes
 gdesklets.spec                  |   24 ++----------------------
 2 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/gdesklets.spec b/gdesklets.spec
index 2f6edcb..c5265e5 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -1,15 +1,9 @@
 #%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+
@@ -17,15 +11,10 @@ License:		GPL+
 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:  python3-devel > 3.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
+BuildRequires:  python-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
@@ -43,11 +32,7 @@ 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 \
@@ -99,16 +84,11 @@ 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