[gdesklets/f15: 3/3] Merge branch 'f16' into f15

[Luya Tshimbalanga]

commit 4eba29c5d72f5a61ae37e4753dd6e6412796bb37
Merge: afcda5a 003559a
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sun Apr 8 00:09:35 2012 -0700

    Merge branch 'f16' into f15
    
    Conflicts:
    	gdesklets.spec

 gdesklets-0.36.3-2.fc16.src.rpm |  Bin 3757675 -> 0 bytes
 gdesklets.spec                  |   23 ++++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --cc gdesklets.spec
index a69d1d6,c5265e5..825a41d
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@@ -1,15 -1,9 +1,21 @@@
  #%define alphatag beta
  
  Name:		gdesklets
 +<<<<<<< HEAD
++<<<<<<< HEAD
  Version:		0.36.3
  Release:		3%{?dist}
  Summary:		Architecture for desktop applets
 +=======
 +Version:	0.36.3
 +Release:	5%{?dist}
 +Summary:	Architecture for desktop applets
 +>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
++=======
++Version:		0.36.3
++Release:		3%{?dist}
++Summary:		Architecture for desktop applets
++>>>>>>> f16
  
  Group:		User Interface/Desktops
  License:		GPL+
@@@ -17,15 -11,10 +23,19 @@@
  URL:			http://%{name}.de/
  Source0:		http://%{name}.de/files/%{name}-%{version}.tar.bz2
  Patch0:		transition.patch
 +<<<<<<< HEAD
++<<<<<<< HEAD
  Patch1:		gdesklets-desktop.patch
 +=======
 +Patch1:		vfs.patch
 +
 +>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
++=======
++Patch1:		gdesklets-desktop.patch
++>>>>>>> f16
  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 +53,15 @@@ bars, weather sensors, news tickers
  %prep
  %setup -q -n %{name}-%{version}
  %patch0 -p1 -b .transition
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +%patch1 -p3 -b .gdesklets-desktop
 +=======
 +%patch1 -p0 -b .vfs
 +>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
++=======
+ %patch1 -p3 -b .gdesklets-desktop
++>>>>>>> f16
  
  %build
  %configure \
@@@ -99,22 -84,11 +113,29 @@@ rm -rf %{buildroot
  
  
  %changelog
 +<<<<<<< HEAD
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> f16
  * 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)
++<<<<<<< HEAD
 +=======
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.36.3-4
 +- Rebuild for new libpng
 +
 +* 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
 +>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
++=======
++>>>>>>> f16
  
  * 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