[i8kutils] Update to 1.33. Build for x86_64 too (#614977). Make gkrellm dependency ISA qualified. Convert docs

[Ville Skyttä]

commit 1734b1f0f43b2859844c7b74a98566afb0d431a1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Nov 5 15:21:19 2011 +0200

    Update to 1.33.
    Build for x86_64 too (#614977).
    Make gkrellm dependency ISA qualified.
    Convert docs to UTF-8.
    Build with %{optflags}.

 .gitignore    |    4 ++--
 i8kutils.spec |   30 +++++++++++++++++++++---------
 sources       |    2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9ebb67..de22cd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-i8krellm-2.5.tar.gz
-i8kutils_1.25.tar.gz
+/i8krellm-2.5.tar.gz
+/i8kutils_1.33.tar.gz
diff --git a/i8kutils.spec b/i8kutils.spec
index 17fd4bb..506e5a3 100644
--- a/i8kutils.spec
+++ b/i8kutils.spec
@@ -3,22 +3,22 @@
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
-Version: 1.25
-Release: 18
+Version: 1.33
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-URL: http://people.debian.org/~dz/i8k/
-Source0: http://people.debian.org/~dz/i8k/i8kutils_%{version}.tar.gz
+URL: http://packages.debian.org/i8kutils
+Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8k.init
 Source3: i8k.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
+Requires: alsa-utils, gkrellm%{?_isa} >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
-# This package is only relevant on Dell laptops, thus i386 only
-ExclusiveArch: %ix86
+# This package is only relevant on Dell laptops, thus ix86, x86_64 only
+ExclusiveArch: %ix86 x86_64
 
 %description
 This package contains a user-space programs for accessing the SMM BIOS of
@@ -31,10 +31,15 @@ Also provided is a cool and useful plugin for gkrellm.
 
 %prep
 %setup -q -a 1
+for f in README.i8kutils i8krellm-%{gkrellmpluginver}/{Changelog,README} ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8
+    touch -r $f $f.utf8 ; mv $f.utf8 $f
+done
+sed -i -e 's/-O2 -Wall/%{optflags}/' i8krellm-%{gkrellmpluginver}/Makefile
 
 
 %build
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 pushd i8krellm-%{gkrellmpluginver}
     make %{?_smp_mflags} i8krellm
 popd
@@ -84,7 +89,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README.i8kutils i8kmon.conf
+%doc README.i8kutils TODO i8kmon.conf
 %doc i8krellm-%{gkrellmpluginver}/AUTHORS i8krellm-%{gkrellmpluginver}/README
 %doc i8krellm-%{gkrellmpluginver}/Changelog
 %{_sysconfdir}/rc.d/init.d/i8k
@@ -95,6 +100,13 @@ fi
 
 
 %changelog
+* Sat Nov  5 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.33-1
+- Update to 1.33.
+- Build for x86_64 too (#614977).
+- Make gkrellm dependency ISA qualified.
+- Convert docs to UTF-8.
+- Build with %%{optflags}.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 674aa4b..b9bf8e5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 adf099b85ca7b6f13ad17ee1a3be2cdb  i8krellm-2.5.tar.gz
-50c03dde689c5709406118a7c6c120db  i8kutils_1.25.tar.gz
+1ab077b301dbb0f4be8ef52eb3b97628  i8kutils_1.33.tar.gz