rpms/gnome-do/F-12 gnome-do-0.8.2-nozoom.patch, NONE, 1.1 gnome-do.spec, 1.43, 1.44 sources, 1.13, 1.14

[Juan Manuel Rodriguez Moreno]

Author: nushio

Update of /cvs/pkgs/rpms/gnome-do/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19442

Modified Files:
	gnome-do.spec sources 
Added Files:
	gnome-do-0.8.2-nozoom.patch 
Log Message:


gnome-do-0.8.2-nozoom.patch:
 Docky.Interface/DockyConfigurationWidget.cs |    4 !!!!
 Docky.Utilities/DockPreferences.cs          |    2 !!
 2 files changed, 6 modifications(!)

--- NEW FILE gnome-do-0.8.2-nozoom.patch ---
diff -rNc gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs
*** gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	Thu Jun 25 22:39:51 2009
--- gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs	Wed Nov 18 11:36:21 2009
***************
*** 133,139 ****
  		
  		void SetSensitivity ()
  		{
! 			zoom_scale.Sensitive = DockPreferences.ZoomEnabled;
  		}
  
  		void HandleToggled (object o, ToggledArgs args)
--- 136,144 ----
  		
  		void SetSensitivity ()
  		{
! 			// disable zoom on Fedora
! 			zoom_checkbutton.Sensitive = false;
! 			zoom_scale.Sensitive = false;
  		}
  
  		void HandleToggled (object o, ToggledArgs args)
diff -rNc gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs
*** gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	Thu Jun 25 22:39:51 2009
--- gnome-do-0.8.2-nozoom/Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs	Wed Nov 18 11:31:57 2009
***************
*** 90,96 ****
  		
  		static bool enable_zoom = prefs.Get ("EnableZoom", true);
  		public static bool ZoomEnabled {
! 			get { return enable_zoom; }
  			set {
  				prefs.Set ("EnableZoom", value);
  				enable_zoom = value;
--- 90,96 ----
  		
  		static bool enable_zoom = prefs.Get ("EnableZoom", true);
  		public static bool ZoomEnabled {
! 			get { return false; }
  			set {
  				prefs.Set ("EnableZoom", value);
  				enable_zoom = value;

Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/gnome-do.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gnome-do.spec	9 Nov 2009 23:17:35 -0000	1.43
+++ gnome-do.spec	18 Nov 2009 18:38:16 -0000	1.44
@@ -1,25 +1,18 @@
 %define			debug_package %{nil}
-%define                 mainver 0.8.2
+%define			mainver 0.8.2
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-# The "Docky" theme code violates US Patent 7434177
-# To generate the clean tarball:
-# tar xvfz gnome-do-%{version}.tar.gz
-# rm -rf gnome-do-%{version}/Do.Interface.Linux.Docky
-# tar cvfz gnome-do-%{version}-nodocky.tar.gz gnome-do-%{version}/
-#
-# You will also need to apply Patch0, which fixes up configure* and Makefile*
-#
-# Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
-Source0:		gnome-do-%{version}-nodocky.tar.gz
-Patch0:			gnome-do-0.8.2-nodocky.patch
+Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+
+# The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
+Patch0:			gnome-do-0.8.2-nozoom.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,14 +31,14 @@ BuildRequires:		gtk2-devel
 BuildRequires:		desktop-file-utils
 
 Requires(pre):		GConf2
-Requires(post): 	GConf2
-Requires(preun): 	GConf2
+Requires(post):		GConf2
+Requires(preun):	GConf2
 
 Requires:		mono(NDesk.DBus.GLib) = 1.0.0.0
 Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
-ExcludeArch:            sparc64
+ExcludeArch:		sparc64
 
 %description
 GNOME Do (Do) is an intelligent launcher tool that makes performing
@@ -66,7 +59,7 @@ Development files for GNOME Do
 
 %prep
 %setup -q
-%patch0 -p1 -b .nodocky
+%patch0 -p1 -b .nozoom
 
 %build
 %configure
@@ -143,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 18 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-5
+- Restored "Docky", but removed Icon Zoom due to potential violation of patents. 
+
 * Tue Nov 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.2-4
 - Remove "Docky" due to patent issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Nov 2009 23:17:35 -0000	1.13
+++ sources	18 Nov 2009 18:38:16 -0000	1.14
@@ -1 +1 @@
-d85a0af65c6f94e85f3ea1b9b24185c4  gnome-do-0.8.2-nodocky.tar.gz
+f84f05f08c12615e1665c6f0d392b8bb  gnome-do-0.8.2.tar.gz