rpms/firmware-tools/FC-6 firmware-tools.spec, 1.1, 1.2 sources, 1.1, 1.2

[Michael E Brown (mebrown)]

Author: mebrown

Update of /cvs/extras/rpms/firmware-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24886

Modified Files:
	firmware-tools.spec sources 
Log Message:
* Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.5.5-1
- rebase to upstream release



Index: firmware-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-tools/FC-6/firmware-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firmware-tools.spec	16 Mar 2007 02:33:59 -0000	1.1
+++ firmware-tools.spec	23 Aug 2007 03:51:38 -0000	1.2
@@ -5,9 +5,10 @@
 # These are all automatically replaced by the release script.
 # START = Do not edit manually
 %define major 1
-%define minor 2
-%define sub 3
+%define minor 5
+%define sub 5
 %define extralevel %{nil}
+%define rpm_release 1
 %define release_name firmware-tools
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 #
@@ -15,8 +16,12 @@
 #
 ###################################################################
 
+# per fedora python packaging guidelines
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+#disable empty debuginfo package
+%define debug_package %{nil}
+
 # SUSE 10 has a crazy distutils.cfg that specifies prefix=/usr/local
 # have to override that.
 %define suse_prefix %{nil}
@@ -26,22 +31,20 @@
 
 # Compat for RHEL3 build
 %if %(test "%{dist}" == ".el3" && echo 1 || echo 0)
-# add in required ABI (hardcode because /usr/bin/python not available at this point)
-Requires:       python-abi = 2.2
 # needed for RHEL3 build, python-devel doesnt seem to Require: python in RHEL3
 BuildRequires:  python
 # override sitelib because this messes up on x86_64
-%define python_sitelib %{_exec_prefix}/python2.2/site-packages/
+%define python_sitelib %{_exec_prefix}/lib/python2.2/site-packages/
 %endif
 
 Name:           firmware-tools 
 Version:        %{release_version} 
-Release:        1%{?dist}
+Release:        %{rpm_release}%{?dist}
 Summary:        Scripts and tools to manage firmware and BIOS updates
 
 Group:          Applications/System
 # License is actually GPL/OSL dual license (GPL Compatible), but rpmlint complains
-License:        GPL style
+License:        GPLv2+ or OSL
 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)
@@ -53,6 +56,7 @@
 %endif
 
 BuildRequires:  python-devel
+Requires: rpm-python
 
 Provides: firmware_inventory(pci) = 0:%{release_version}
 
@@ -88,6 +92,7 @@
 %doc COPYING-GPL COPYING-OSL README
 %{python_sitelib}/*
 %attr(0755,root,root) %{_bindir}/*
+%{_datadir}/firmware-tools/
 %dir %{_sysconfdir}/firmware
 %dir %{_sysconfdir}/firmware/firmware.d
 %config(noreplace) %{_sysconfdir}/firmware/firmware.conf
@@ -95,8 +100,24 @@
 
 
 %changelog
+* Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.5.5-1
+- rebase to upstream release
+
+* Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.2-1
+- rebase to upstream release
+
+* Tue May 1 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.6-1
+- disable empty debuginfo package
+
+* Tue Mar 20 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.5-1
+- Remove python-abi dep for RHEL3 (it was broken)
+
+* Fri Mar 16 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.4-1
+- fix typo in sitelib path -- only for RHEL3 build
+
 * Wed Mar 14 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.3-1
 - create and own {_sysconfdir}/firmware/firmware.d/ for plugins.
 - Fedora review changes
+
 * Mon Mar 12 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.0-1
 - Fedora-compliant packaging changes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-tools/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2007 02:33:59 -0000	1.1
+++ sources	23 Aug 2007 03:51:38 -0000	1.2
@@ -1 +1 @@
-5cf6e736d57184895453c3ba9504549b  firmware-tools-1.2.3.tar.gz
+956c47af59d17dfa8d1c41136c45f920  firmware-tools-1.5.5.tar.gz