[gdesklets: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gdesklets

[Luya Tshimbalanga]

commit afcda5a61bf875bcfea5135fbd5e34cecf626f21
Merge: a1eb553 72560f6
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sat Apr 7 23:34:47 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gdesklets

 .gitignore     |    1 +
 gdesklets.spec |   31 +++++++++++++++++++++++++++++--
 sources        |    1 +
 3 files changed, 31 insertions(+), 2 deletions(-)
---
diff --cc gdesklets.spec
index 6bb15fc,1fc7a9b..a69d1d6
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@@ -1,21 -1,22 +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:	5%{?dist}
+ Summary:	Architecture for desktop applets
++>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
  
  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:		gdesklets-desktop.patch
++=======
+ Patch1:		vfs.patch
+ 
++>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
  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
@@@ -32,7 -33,7 +43,11 @@@ bars, weather sensors, news tickers
  %prep
  %setup -q -n %{name}-%{version}
  %patch0 -p1 -b .transition
++<<<<<<< HEAD
 +%patch1 -p3 -b .gdesklets-desktop
++=======
+ %patch1 -p0 -b .vfs
++>>>>>>> 72560f6948e3dfa7718b96345b8e44d18f43b9e1
  
  %build
  %configure \
@@@ -84,10 -87,15 +99,22 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
 +* 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)
++=======
+ * 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
  
  * 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