rpms/firmware-addon-dell/devel firmware-addon-dell.spec,1.21,1.22

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/firmware-addon-dell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10058

Modified Files:
	firmware-addon-dell.spec 
Log Message:
update to upstream 2.2.1


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- firmware-addon-dell.spec	24 Jul 2009 22:49:15 -0000	1.21
+++ firmware-addon-dell.spec	11 Dec 2009 19:17:12 -0000	1.22
@@ -1,11 +1,17 @@
 # vim:tw=0:ts=4:sw=4:et
 %define major 2
-%define minor 1
-%define sub 2
+%define minor 2
+%define micro 1
 %define extralevel %{nil}
-%define rpm_release 1
 %define release_name firmware-addon-dell
-%define release_version %{major}.%{minor}.%{sub}%{extralevel}
+%define release_version %{major}.%{minor}.%{micro}%{extralevel}
+
+# required by suse build system
+# norootforbuild
+
+%define run_unit_tests 1
+%{?_without_unit_tests: %define run_unit_tests 0}
+%{?_with_unit_tests:    %define run_unit_tests 1}
 
 %define python_xml_BR %{nil}
 # Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
@@ -23,12 +29,12 @@
 
 Name:           %{release_name}
 Version:        %{release_version} 
-Release:        5.3%{?releasesuffix}%{?dist}
+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/ 
+URL:            http://linux.dell.com/libsmbios/download/
 Source0:        http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,13 +46,13 @@ ExclusiveArch: x86_64 ia64 %{ix86}
 # 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 yum
+BuildRequires: firmware-tools
 %endif
 
-Requires: smbios-utils
+Requires: smbios-utils python-smbios
 Requires: firmware-tools >= 0:2.0.0
 Provides: firmware_inventory(system_bios)  = 0:%{version}
-BuildRequires:  python-devel, firmware-tools, %{python_xml_BR}
+BuildRequires:  python-smbios, python-devel, firmware-tools, %{python_xml_BR}
 
 %description
 The firmware-addon-dell package provides plugins to firmware-tools which enable
@@ -67,17 +73,19 @@ applicable to most Dell systems.
 touch configure
 find . -type f -newer configure -print0 | xargs -r0 touch
 
-%configure
-make -e %{?_smp_mflags} 
+%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
+make %{?_smp_mflags}
 
 %check
-make -e %{?_smp_mflags} check
+%if 0%{?run_unit_tests}
+make %{?_smp_mflags} check
+%endif
 
 %install
 # Fedora Packaging guidelines
 rm -rf $RPM_BUILD_ROOT
 # SUSE Packaging rpmlint
-mkdir -p $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
 
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
@@ -92,13 +100,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING-GPL COPYING-OSL
 %{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/firmware/firmware.d/*.conf
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysidplugin.conf
 %{_datadir}/firmware/dell
-%{_exec_prefix}/lib/yum-plugins/*
 %{_datadir}/firmware-tools/*
 
 
 %changelog
+* Fri Dec 11 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.2.1-1
+- rebase to latest upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-5.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild