[gkrellm-sun/f17] fix FTBFS

[Tom Callaway]

commit 0081b10cb038f751fd7b31791261868d1f4a70fd
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Mar 9 14:06:48 2012 -0500

    fix FTBFS

 gkrellm-sun.spec            |   19 ++++++++-----------
 gkrellsun-1.0.0-fixes.patch |   38 ++++++++++----------------------------
 2 files changed, 18 insertions(+), 39 deletions(-)
---
diff --git a/gkrellm-sun.spec b/gkrellm-sun.spec
index da3dbc6..bb14cc7 100644
--- a/gkrellm-sun.spec
+++ b/gkrellm-sun.spec
@@ -3,13 +3,12 @@
 Summary: Sun clock plugin for GKrellM
 Name: gkrellm-sun
 Version: 1.0.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://gkrellsun.sourceforge.net/
 Source: http://downloads.sf.net/gkrellsun/gkrellsun-%{version}.tar.gz
 Patch0: gkrellsun-1.0.0-fixes.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gkrellm >= 2.2.0
 BuildRequires: gkrellm-devel >= 2.2.0
 
@@ -20,30 +19,28 @@ time, path and current location and so on.
 
 %prep
 %setup -q -n gkrellsun-%{version}
-%patch0 -p1
+%patch0 -p1 -b .fixes
 
 
 %build
-%{__make} FLAGS='%{optflags} -fPIC $(GTK_INCLUDE)'
+make FLAGS='%{optflags} -fPIC $(GTK_INCLUDE)'
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -D -m 0755 src20/gkrellsun.so \
+rm -rf %{buildroot}
+install -D -m 0755 src20/gkrellsun.so \
     %{buildroot}%{gkplugindir}/gkrellsun.so
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{gkplugindir}/gkrellsun.so
 
 
 %changelog
+* Fri Mar  9 2012 Tom Callaway <spot at fedoraproject.org> - 1.0.0-12
+- fix FTBFS
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/gkrellsun-1.0.0-fixes.patch b/gkrellsun-1.0.0-fixes.patch
index bc10110..94750a3 100644
--- a/gkrellsun-1.0.0-fixes.patch
+++ b/gkrellsun-1.0.0-fixes.patch
@@ -1,15 +1,6 @@
-diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/gkrellsun.c tmp/gkrellsun/src20/gkrellsun.c
---- gkrellsun-1.0.0/src20/gkrellsun.c	2006-03-17 14:29:51.000000000 +0100
-+++ tmp/gkrellsun/src20/gkrellsun.c	2006-04-07 18:32:43.000000000 +0200
-@@ -3,7 +3,7 @@
-  * Copyright (C) 2001, 2002, 2003 Norman Walsh. Derived from gkrellmoon by
-  * Dale P. Smith and wmSun by Mike Henderson
-  *
-- * $Id: gkrellsun-1.0.0-fixes.patch,v 1.1 2010/05/04 20:13:37 thias Exp $
-+ * $Id: gkrellsun-1.0.0-fixes.patch,v 1.1 2010/05/04 20:13:37 thias Exp $
-  *
-  */
- #if !defined(WIN32)
+diff -up gkrellsun-1.0.0/src20/gkrellsun.c.fixes gkrellsun-1.0.0/src20/gkrellsun.c
+--- gkrellsun-1.0.0/src20/gkrellsun.c.fixes	2006-03-17 08:29:51.000000000 -0500
++++ gkrellsun-1.0.0/src20/gkrellsun.c	2012-03-09 14:05:39.076951940 -0500
 @@ -746,7 +746,7 @@ static void drawTextTime(double tod, int
  };
  
@@ -37,7 +28,7 @@ diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/gkrellsun.c tmp/gkrellsun/src20/
  {
     gint i, j;
  
-@@ -1362,12 +1362,12 @@ static void sun_create_plugin(GtkWidget 
+@@ -1362,12 +1362,12 @@ static void sun_create_plugin(GtkWidget
  
     if (first_create)
     {
@@ -54,15 +45,6 @@ diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/gkrellsun.c tmp/gkrellsun/src20/
           NULL);
  
        tooltip=gtk_tooltips_new();
-@@ -1672,7 +1672,7 @@ sun_create_tab(GtkWidget *tab_vbox)
-       plugin_about_text = g_strdup_printf(
-          _("SunClock %d.%d.%d\n" \
- 	   "GKrellM2 SunClock Plugin\n" \
--	   "$Id: gkrellsun-1.0.0-fixes.patch,v 1.1 2010/05/04 20:13:37 thias Exp $\n\n" \
-+	   "$Id: gkrellsun-1.0.0-fixes.patch,v 1.1 2010/05/04 20:13:37 thias Exp $\n\n" \
- 	   "Copyright (C) 2001, 2002, 2003, 2004, 2006 Norman Walsh\n" \
- 	   "ndw at nwalsh.com\n\n" \
- 	   "v0.10.0+ Additional code by Kurt V. Hindenburg\n" \
 @@ -1694,7 +1694,7 @@ sun_create_tab(GtkWidget *tab_vbox)
  }
  
@@ -81,9 +63,9 @@ diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/gkrellsun.c tmp/gkrellsun/src20/
  #endif
  {
     gint sun, time;
-diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/Moon.c tmp/gkrellsun/src20/Moon.c
---- gkrellsun-1.0.0/src20/Moon.c	2004-03-06 07:35:41.000000000 +0100
-+++ tmp/gkrellsun/src20/Moon.c	2006-04-07 19:01:06.000000000 +0200
+diff -up gkrellsun-1.0.0/src20/Moon.c.fixes gkrellsun-1.0.0/src20/Moon.c
+--- gkrellsun-1.0.0/src20/Moon.c.fixes	2004-03-06 01:35:41.000000000 -0500
++++ gkrellsun-1.0.0/src20/Moon.c	2012-03-09 14:05:39.078951920 -0500
 @@ -363,8 +363,7 @@ gdouble * AGE)
  
  gdouble NewMoon(gdouble ax, gdouble bx, gdouble cx)
@@ -94,9 +76,9 @@ diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/Moon.c tmp/gkrellsun/src20/Moon.
     gdouble L, B, Rad, AGE, tol = 1e-7;
  
     x0 = ax;
-diff -Naupr --exclude=CVS gkrellsun-1.0.0/src20/MoonRise.c tmp/gkrellsun/src20/MoonRise.c
---- gkrellsun-1.0.0/src20/MoonRise.c	2006-03-16 19:47:37.000000000 +0100
-+++ tmp/gkrellsun/src20/MoonRise.c	2006-04-07 19:01:06.000000000 +0200
+diff -up gkrellsun-1.0.0/src20/MoonRise.c.fixes gkrellsun-1.0.0/src20/MoonRise.c
+--- gkrellsun-1.0.0/src20/MoonRise.c.fixes	2006-03-16 13:47:37.000000000 -0500
++++ gkrellsun-1.0.0/src20/MoonRise.c	2012-03-09 14:05:39.079951910 -0500
 @@ -63,10 +63,8 @@ Interp(gdouble ym, gdouble y0, gdouble y
  
  static gdouble SinH(CTrans * c, gdouble UT)