rpms/firmware-tools/EL-5 firmware-tools.spec, 1.5, 1.6 sources, 1.3, 1.4

Matt Domsch mdomsch at fedoraproject.org
Sat May 16 03:28:13 UTC 2009


Author: mdomsch

Update of /cvs/extras/rpms/firmware-tools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21613

Modified Files:
	firmware-tools.spec sources 
Log Message:
rebase to upstream release to be compatible with BIOS payloads published on linux.dell.com/repo/firmware


Index: firmware-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-tools/EL-5/firmware-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- firmware-tools.spec	25 Jul 2008 14:07:22 -0000	1.5
+++ firmware-tools.spec	16 May 2009 03:27:42 -0000	1.6
@@ -1,64 +1,39 @@
-###################################################################
-#
-# WARNING
-#
-# These are all automatically replaced by the release script.
-# START = Do not edit manually
-%define major 1
-%define minor 5
-%define sub 5
-%define extralevel %{nil}
+# vim:tw=0:ts=4:sw=4:et
+
+%define major 2
+%define minor 1
+%define micro 5
+%define extra %{nil}
+%define release_version %{major}.%{minor}.%{micro}%{extra}
 %define rpm_release 1
-%define release_name firmware-tools
-%define release_version %{major}.%{minor}.%{sub}%{extralevel}
-#
-# END = Do not edit manually
-#
-###################################################################
 
 # 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}
-%if %(test -e /etc/SuSE-release && echo 1 || echo 0)
-%define suse_prefix --prefix=/usr
-%endif
-
-# Compat for RHEL3 build
-%if %(test "%{dist}" == ".el3" && echo 1 || echo 0)
-# 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}/lib/python2.2/site-packages/
-%endif
-
-Name:           firmware-tools 
-Version:        %{release_version} 
-Release:        %{rpm_release}%{?dist}
+Name:           firmware-tools
+Version:        %{release_version}
+Release:        1.1%{?releasesuffix}%{?dist}
 Summary:        Scripts and tools to manage firmware and BIOS updates
 
 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)
 
-# This package is noarch for everything except RHEL3. Have to build arch
-# specific pkgs for RHEL3
-%if %(test "%{dist}" != ".el3" && echo 1 || echo 0)
+# SUSE doesnt have noarch python, so for SUSE, always build arch-dependent
+%if ! 0%{?suse_version}
 BuildArch:      noarch
 %endif
 
-BuildRequires:  python-devel
-Requires: rpm-python
-
+BuildRequires:  python-devel, rpm-python
+Requires: rpm-python, pciutils
 Provides: firmware_inventory(pci) = 0:%{release_version}
 
+# packages that dont conform to latest ABI
+Conflicts: firmware_addon_dell < 0:2.1.0
+Conflicts: dell-dup < 0:1.1.0
+
 %description
 The firmware-tools project provides tools to inventory hardware and a plugin
 architecture so that different OEM vendors can provide different inventory
@@ -72,24 +47,49 @@ a framework for BIOS and firmware update
 
 
 %build
-%{__python} setup.py build
+# 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
+
+%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
+make -e %{?_smp_mflags}
 
+%check
+make -e %{?_smp_mflags} check
 
 %install
+# Fedora Packaging guidelines
 rm -rf $RPM_BUILD_ROOT
+# SUSE Packaging rpmlint
+mkdir $RPM_BUILD_ROOT
+
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/firmware/firmware.d/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %{suse_prefix}
 
- 
+# backwards compatibility symlinks
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+ln -s firmwaretool $RPM_BUILD_ROOT/%{_sbindir}/inventory_firmware
+ln -s firmwaretool $RPM_BUILD_ROOT/%{_sbindir}/bootstrap_firmware
+ln -s firmwaretool $RPM_BUILD_ROOT/%{_sbindir}/update_firmware
+ln -s %{_sbindir}/firmwaretool $RPM_BUILD_ROOT/%{_bindir}/update_firmware
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
+%doc COPYING-GPL COPYING-OSL COPYING.LIB README
 %{python_sitelib}/*
+%attr(0755,root,root) %{_sbindir}/*
 %attr(0755,root,root) %{_bindir}/*
 %{_datadir}/firmware-tools/
 %dir %{_sysconfdir}/firmware
@@ -99,6 +99,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 14 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.1.5-1.1
+- rebase to upstream release
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.6-2.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.5.6-2.1
+- Rebuild for Python 2.6
+
+* Thu Aug 23 2007 Michael E Brown <michael_e_brown at dell.com> - 1.5.6-1
+- rebase to upstream release
+
 * Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.5.5-1
 - rebase to upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-tools/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2007 03:48:48 -0000	1.3
+++ sources	16 May 2009 03:27:42 -0000	1.4
@@ -1 +1 @@
-956c47af59d17dfa8d1c41136c45f920  firmware-tools-1.5.5.tar.gz
+c541e4f75a23b81541270cabc1bb7381  firmware-tools-2.1.5.tar.gz




More information about the fedora-extras-commits mailing list