rpms/firmware-addon-dell/F-10 .cvsignore, 1.14, 1.15 firmware-addon-dell.spec, 1.17, 1.18 sources, 1.14, 1.15

Matt Domsch mdomsch at fedoraproject.org
Sat May 16 12:51:50 UTC 2009


Author: mdomsch

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

Modified Files:
	.cvsignore firmware-addon-dell.spec sources 
Log Message:
update to latest upstream, matching firmware-tools 2.1.5 API


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Aug 2007 17:26:07 -0000	1.14
+++ .cvsignore	16 May 2009 12:51:19 -0000	1.15
@@ -1 +1 @@
-firmware-addon-dell-1.4.8.tar.gz
+firmware-addon-dell-2.1.2.tar.gz


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/F-10/firmware-addon-dell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- firmware-addon-dell.spec	25 Jul 2008 14:10:26 -0000	1.17
+++ firmware-addon-dell.spec	16 May 2009 12:51:19 -0000	1.18
@@ -1,46 +1,29 @@
 # vim:tw=0:ts=4:sw=4:et
-
-###################################################################
-#
-# WARNING
-#
-# These are all automatically replaced by the release script.
-# START = Do not edit manually
-%define major 1
-%define minor 4
-%define sub 8
+%define major 2
+%define minor 1
+%define sub 2
 %define extralevel %{nil}
-%define rpm_release 2
+%define rpm_release 1
 %define release_name firmware-addon-dell
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
-#
-# END = Do not edit manually
-#
-###################################################################
 
+%define python_xml_BR %{nil}
+# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
+# SUSE: fedora_version  suse_version rhel_version centos_version sles_version
+# Fedora: fedora dist fc8 fc9
+%if 0%{?suse_version} || 0%{?sles_version}
+    %define python_xml_BR python-xml
+%endif
+
+# per fedora python packaging guidelines
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 # no debuginfo package, as there are no compiled binaries.
 %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:           %{release_name}
 Version:        %{release_version} 
-Release:        %{rpm_release}%{?dist}
+Release:        4.3%{?releasesuffix}%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
@@ -53,52 +36,79 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # on, eg. PPC.  Also, we rely on libsmbios, which is only avail on Intel-compat
 ExclusiveArch: x86_64 ia64 %{ix86}
 
-BuildRequires:  python-devel
-
-# I know rpmlint complains about this (An ERROR, in fact), but it is a
-# false positive. Auto deps cannot find this one because I actually am running
-# binaries, not linking agains libs, as indicated by the fact that I require 
-# the -bin package
-Requires: libsmbios-bin 
-Requires: firmware-tools >= 0:1.5
+# 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 yum
+%endif
 
+Requires: smbios-utils
+Requires: firmware-tools >= 0:2.0.0
 Provides: firmware_inventory(system_bios)  = 0:%{version}
-Provides: firmware_inventory(bmc) = 0:%{version}
+BuildRequires: firmware-tools > 0:2.0
+BuildRequires:  python-devel, %{python_xml_BR}
 
 %description
 The firmware-addon-dell package provides plugins to firmware-tools which enable
 BIOS updates for Dell system, plus pulls in standard inventory modules
 applicable to most Dell systems.
 
-
 %prep
 %setup -q
 
 
 %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
+make -e %{?_smp_mflags} 
+
+%check
+make -e %{?_smp_mflags} check
 
 %install
+# Fedora Packaging guidelines
 rm -rf $RPM_BUILD_ROOT
+# SUSE Packaging rpmlint
+mkdir -p $RPM_BUILD_ROOT
+
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %{suse_prefix}
- 
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL readme.txt
+%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/dellsysidplugin.*
+%{_exec_prefix}/lib/yum-plugins/*
+%{_datadir}/firmware-tools/*
 
 
 %changelog
+* Thu May 14 2009 Matt Domsch <mdomsch at fedoraproject.org> - 2.1.2-4.3
+- rebase to latest upstream
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.8-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.4.8-2.1
+- Rebuild for Python 2.6
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.8-1
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Aug 2007 17:26:07 -0000	1.14
+++ sources	16 May 2009 12:51:19 -0000	1.15
@@ -1 +1 @@
-7c9f48bd6bc38e4c5dfdc4dcb3de4ee0  firmware-addon-dell-1.4.8.tar.gz
+1e15ab2cbdebf0ff14729d429f1293c6  firmware-addon-dell-2.1.2.tar.gz




More information about the fedora-extras-commits mailing list