rpms/gnome-do/F-12 gnome-do-0.8.2-nodocky.patch, NONE, 1.1 gnome-do.spec, 1.42, 1.43 sources, 1.12, 1.13

Mon Nov 9 23:17:35 UTC 2009

Author: spot

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

Modified Files:
	gnome-do.spec sources 
Added Files:
	gnome-do-0.8.2-nodocky.patch 
Log Message:
remove "Docky" due to patent infringement

gnome-do-0.8.2-nodocky.patch:
 Makefile.am  |    1 -
 Makefile.in  |    1 -
 configure    |    4 +---
 configure.ac |    2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE gnome-do-0.8.2-nodocky.patch ---
diff -up gnome-do-0.8.2/configure.ac.nodocky gnome-do-0.8.2/configure.ac
--- gnome-do-0.8.2/configure.ac.nodocky	2009-11-10 09:01:30.183788696 +1000
+++ gnome-do-0.8.2/configure.ac	2009-11-10 09:01:39.240778770 +1000
@@ -130,8 +130,6 @@ Do.Interface.Linux/Makefile
 Do.Interface.Linux/src/AssemblyInfo.cs
 Do.Interface.Linux.AnimationBase/Makefile
 Do.Interface.Linux.Classic/Makefile
-Do.Interface.Linux.Docky/Makefile
-Do.Interface.Linux.Docky/AssemblyInfo.cs
 Do.Interface.Linux.GlassFrame/Makefile
 Do.Interface.Linux.HUD/Makefile
 Do.Interface.Linux.Mini/Makefile
diff -up gnome-do-0.8.2/configure.nodocky gnome-do-0.8.2/configure
--- gnome-do-0.8.2/configure.nodocky	2009-11-10 09:00:49.172900856 +1000
+++ gnome-do-0.8.2/configure	2009-11-10 09:01:22.158902892 +1000
@@ -17244,7 +17244,7 @@ fi
 
 fi
 
-ac_config_files="$ac_config_files BundledLibraries/Makefile Do/Do.exe.config Do/Makefile Do/gnome-do Do/src/AssemblyInfo.cs Do.Interface.Linux/Makefile Do.Interface.Linux/src/AssemblyInfo.cs Do.Interface.Linux.AnimationBase/Makefile Do.Interface.Linux.Classic/Makefile Do.Interface.Linux.Docky/Makefile Do.Interface.Linux.Docky/AssemblyInfo.cs Do.Interface.Linux.GlassFrame/Makefile Do.Interface.Linux.HUD/Makefile Do.Interface.Linux.Mini/Makefile Do.Interface.Wink/Makefile Do.Interface.Wink/src/AssemblyInfo.cs Do.Platform/Makefile Do.Platform/src/AssemblyInfo.cs Do.Platform.Linux/Makefile Do.Platform.Linux/src/AssemblyInfo.cs Do.Platform.OSX/AssemblyInfo.cs Do.Platform.Windows/AssemblyInfo.cs Do.Universe/Makefile Do.Universe/src/AssemblyInfo.cs libdo/Makefile Makefile data/Makefile data/Docky.DefaultClockTheme/Makefile data/icons/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/apps/Make
 file data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/apps/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/256x256/Makefile data/icons/hicolor/256x256/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/apps/Makefile data/icons/hicolor/Makefile m4/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files BundledLibraries/Makefile Do/Do.exe.config Do/Makefile Do/gnome-do Do/src/AssemblyInfo.cs Do.Interface.Linux/Makefile Do.Interface.Linux/src/AssemblyInfo.cs Do.Interface.Linux.AnimationBase/Makefile Do.Interface.Linux.Classic/Makefile Do.Interface.Linux.GlassFrame/Makefile Do.Interface.Linux.HUD/Makefile Do.Interface.Linux.Mini/Makefile Do.Interface.Wink/Makefile Do.Interface.Wink/src/AssemblyInfo.cs Do.Platform/Makefile Do.Platform/src/AssemblyInfo.cs Do.Platform.Linux/Makefile Do.Platform.Linux/src/AssemblyInfo.cs Do.Platform.OSX/AssemblyInfo.cs Do.Platform.Windows/AssemblyInfo.cs Do.Universe/Makefile Do.Universe/src/AssemblyInfo.cs libdo/Makefile Makefile data/Makefile data/Docky.DefaultClockTheme/Makefile data/icons/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/apps/Makefi
 le data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/256x256/Makefile data/icons/hicolor/256x256/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/apps/Makefile data/icons/hicolor/Makefile m4/Makefile po/Makefile.in"
 
 
 cat >confcache <<\_ACEOF
@@ -18195,8 +18195,6 @@ do
     "Do.Interface.Linux/src/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux/src/AssemblyInfo.cs" ;;
     "Do.Interface.Linux.AnimationBase/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.AnimationBase/Makefile" ;;
     "Do.Interface.Linux.Classic/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.Classic/Makefile" ;;
-    "Do.Interface.Linux.Docky/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.Docky/Makefile" ;;
-    "Do.Interface.Linux.Docky/AssemblyInfo.cs") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.Docky/AssemblyInfo.cs" ;;
     "Do.Interface.Linux.GlassFrame/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.GlassFrame/Makefile" ;;
     "Do.Interface.Linux.HUD/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.HUD/Makefile" ;;
     "Do.Interface.Linux.Mini/Makefile") CONFIG_FILES="$CONFIG_FILES Do.Interface.Linux.Mini/Makefile" ;;
diff -up gnome-do-0.8.2/Makefile.am.nodocky gnome-do-0.8.2/Makefile.am
--- gnome-do-0.8.2/Makefile.am.nodocky	2009-11-10 09:01:53.100778759 +1000
+++ gnome-do-0.8.2/Makefile.am	2009-11-10 09:01:58.548872598 +1000
@@ -13,7 +13,6 @@ SUBDIRS = \
 	Do.Platform.Linux \
 	Do.Interface.Linux.AnimationBase \
 	Do.Interface.Linux.Classic \
-	Do.Interface.Linux.Docky \
 	Do.Interface.Linux.GlassFrame \
 	Do.Interface.Linux.HUD \
 	Do.Interface.Linux.Mini \
diff -up gnome-do-0.8.2/Makefile.in.nodocky gnome-do-0.8.2/Makefile.in
--- gnome-do-0.8.2/Makefile.in.nodocky	2009-11-10 09:02:05.186779316 +1000
+++ gnome-do-0.8.2/Makefile.in	2009-11-10 09:02:09.834778379 +1000
@@ -282,7 +282,6 @@ SUBDIRS = \
 	Do.Platform.Linux \
 	Do.Interface.Linux.AnimationBase \
 	Do.Interface.Linux.Classic \
-	Do.Interface.Linux.Docky \
 	Do.Interface.Linux.GlassFrame \
 	Do.Interface.Linux.HUD \
 	Do.Interface.Linux.Mini \


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/gnome-do.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gnome-do.spec	26 Oct 2009 18:41:19 -0000	1.42
+++ gnome-do.spec	9 Nov 2009 23:17:35 -0000	1.43
@@ -3,13 +3,23 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://edge.launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
+# 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
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,6 +66,7 @@ Development files for GNOME Do
 
 %prep
 %setup -q
+%patch0 -p1 -b .nodocky
 
 %build
 %configure
@@ -132,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.2-4
+- Remove "Docky" due to patent issues
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
 - Exclude sparc64  no mono available
 


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


