[firmware-addon-dell] update to 2.2.9

[Matt Domsch]

commit 151a8f1fbaf78e960ed078db49c559b843226c41
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Mon Sep 27 13:22:59 2010 -0500

    update to 2.2.9

 .gitignore               |    2 +-
 firmware-addon-dell.spec |   44 +++++++++++++++++++++-----------------------
 sources                  |    2 +-
 3 files changed, 23 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6fe4fa..f1f02ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-firmware-addon-dell-2.2.1.tar.gz
+firmware-addon-dell-2.2.9.tar.bz2
diff --git a/firmware-addon-dell.spec b/firmware-addon-dell.spec
index 2f07e7d..314778c 100644
--- a/firmware-addon-dell.spec
+++ b/firmware-addon-dell.spec
@@ -1,10 +1,9 @@
 # vim:tw=0:ts=4:sw=4:et
 %define major 2
 %define minor 2
-%define micro 1
-%define extralevel %{nil}
-%define release_name firmware-addon-dell
-%define release_version %{major}.%{minor}.%{micro}%{extralevel}
+%define micro 9
+%define extra %{nil}
+%define release_version %{major}.%{minor}.%{micro}%{extra}
 
 # required by suse build system
 # norootforbuild
@@ -27,32 +26,27 @@
 # no debuginfo package, as there are no compiled binaries.
 %define debug_package %{nil}
 
-Name:           %{release_name}
-Version:        %{release_version} 
-Release:        3%{?dist}
+Name:           firmware-addon-dell
+Version:        %{release_version}
+Release:        1%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
 License:        GPLv2+ or OSL 2.1
 URL:            http://linux.dell.com/libsmbios/download/
-Source0:        http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:        http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Dell only sells Intel-compat systems, so this package doesnt make much sense
 # on, eg. PPC.  Also, we rely on libsmbios, which is only avail on Intel-compat
 ExclusiveArch: x86_64 ia64 %{ix86}
 
-# SUSE build has anal directory ownership check. RPM which owns all dirs *must*
-# be installed at buildtime. This means we have to BuildRequire them, even if
-# we dont really need them at build time.
-%if 0%{?suse_version}
-BuildRequires: firmware-tools
-%endif
+BuildRequires: firmware-tools > 0:2.0
+BuildRequires:  python-smbios python-devel %{python_xml_BR}
 
 Requires: smbios-utils python-smbios
 Requires: firmware-tools >= 0:2.0.0
 Provides: firmware_inventory(system_bios)  = 0:%{version}
-BuildRequires:  python-smbios, python-devel, firmware-tools, %{python_xml_BR}
 
 %description
 The firmware-addon-dell package provides plugins to firmware-tools which enable
@@ -67,11 +61,12 @@ applicable to most Dell systems.
 # this line lets us build an RPM directly from a git tarball
 [ -e ./configure ] || ./autogen.sh
 
-# fix problems when buildsystem time is out of sync. ./configure will
-# fail if newly created files are older than the packaged files.
-# this should normally be a no-op on proper buildsystems.
-touch configure
-find . -type f -newer configure -print0 | xargs -r0 touch
+# only applicable on obs
+# # fix problems when buildsystem time is out of sync. ./configure will
+# # fail if newly created files are older than the packaged files.
+# # this should normally be a no-op on proper buildsystems.
+# touch configure
+# find . -type f -newer configure -print0 | xargs -r0 touch
 
 %configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
 make %{?_smp_mflags}
@@ -85,7 +80,7 @@ make %{?_smp_mflags} check
 # Fedora Packaging guidelines
 rm -rf $RPM_BUILD_ROOT
 # SUSE Packaging rpmlint
-mkdir $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
 
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
@@ -105,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 27 2010 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.9-1
+- update to latest upstream
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
@@ -144,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.10-1
 - Couple of changes so that the dell sysid plugin work on yum 2.4.3
-  prior versions didnt crash, but didnt properly substitute mirrolist 
+  prior versions didnt crash, but didnt properly substitute mirrolist
   because the name of mirrolist var is different in 2.4.3.
 - Per discussion on mailing list, convert to arch-specific pkg
 - package bin/up2date_repo_autoconf only for RHEL{3,4} releases
@@ -175,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add ExcludeArch to fix problem where f-a-d was being added to ppc repo
 
 * Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.2-1
-- Trivial changes to add specific {_datadir}/firmware/dell 
+- Trivial changes to add specific {_datadir}/firmware/dell
 
 * Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.1-1
 - Trivial changes to make rpmlint happier
diff --git a/sources b/sources
index 5d4fdc6..b6001c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-180729694fd893f7c5fc029a1ca83717  firmware-addon-dell-2.2.1.tar.gz
+dd7298c9dd2807893d1c01e4e473c098  firmware-addon-dell-2.2.9.tar.bz2