rpms/firmware-addon-dell/devel .cvsignore, 1.10, 1.11 firmware-addon-dell.spec, 1.10, 1.11 sources, 1.10, 1.11

Michael E Brown (mebrown) fedora-extras-commits at redhat.com
Mon Aug 13 07:04:04 UTC 2007


Author: mebrown

Update of /cvs/extras/rpms/firmware-addon-dell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24622

Modified Files:
	.cvsignore firmware-addon-dell.spec sources 
Log Message:
* Mon Aug 13 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.2-1
- rebase to upstream latest



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Apr 2007 14:57:53 -0000	1.10
+++ .cvsignore	13 Aug 2007 07:03:30 -0000	1.11
@@ -1 +1 @@
-firmware-addon-dell-1.2.13.tar.gz
+firmware-addon-dell-1.4.2.tar.gz


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/firmware-addon-dell.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firmware-addon-dell.spec	1 May 2007 22:44:57 -0000	1.10
+++ firmware-addon-dell.spec	13 Aug 2007 07:03:30 -0000	1.11
@@ -1,3 +1,5 @@
+# vim:tw=0:ts=4:sw=4:et
+
 ###################################################################
 #
 # WARNING
@@ -5,9 +7,10 @@
 # These are all automatically replaced by the release script.
 # START = Do not edit manually
 %define major 1
-%define minor 2
-%define sub 13
+%define minor 4
+%define sub 2
 %define extralevel %{nil}
+%define rpm_release 1
 %define release_name firmware-addon-dell
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 #
@@ -15,10 +18,9 @@
 #
 ###################################################################
 
-# 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
+# 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
@@ -38,7 +40,7 @@
 
 Name:           %{release_name}
 Version:        %{release_version} 
-Release:        2%{?dist}
+Release:        %{rpm_release}%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
@@ -59,7 +61,7 @@
 # binaries, not linking agains libs, as indicated by the fact that I require 
 # the -bin package
 Requires: libsmbios-bin 
-Requires: firmware-tools > 0:1.1
+Requires: firmware-tools >= 0:1.4
 
 Provides: firmware_inventory(system_bios)  = 0:%{version}
 Provides: firmware_inventory(bmc) = 0:%{version}
@@ -82,22 +84,6 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %{suse_prefix}
-
-
-%if %(test "%{dist}" == ".el3" && echo 1 || echo 0)
-    chmod u+w $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-    echo 'osname=el3.$basearch' >> $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-%else 
-    %if %(test "%{dist}" == ".el4" && echo 1 || echo 0)
-        chmod u+w $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-        echo 'osname=el4.$basearch' >> $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-    %else
-        # if not RHEL3 or RHEL4, remove extra files so we dont get RPM unpackaged file errors
-        rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-        rm -f $RPM_BUILD_ROOT/%{_bindir}/up2date_repo_autoconf
-    %endif
-%endif
-
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,24 +98,14 @@
 %{_datadir}/firmware/dell
 %{_exec_prefix}/lib/yum-plugins/dellsysidplugin.*
 
-# drop when we drop EL4 support
-%if %(test "%{dist}" == ".el3" -o "%{dist}" == ".el4" && echo 1 || echo 0)
-%config(noreplace) %{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-%attr(0755,root,root) %{_bindir}/*
-%endif
-
 
 %changelog
-* Tue May 1 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.14-1
-- disable empty debuginfo package
+* Mon Aug 13 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.2-1
+- rebase to upstream latest
 
-* Sat Apr 7 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.13-1
-- New dellsysidplugin.py yum plugin that works with new yum API.
-  New yum api has postconfig hook, so we should no longer conflict with things
-  like yum presto or cause network errors with pup.
-- changes to up2date_repo_autoconf based on code review by skvidal
-- bugfix where local variable 'package' hid module 'package' and caused 
-  an error in the error handling path.
+* Wed Jul 11 2007 Michael E Brown <michael_e_brown at dell.com> - 1.3.1-1
+- up2date_repo_autoconf is now obsolete. dell-*-repository files no longer
+  use it.
 
 * Sat Apr 7 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.11-1
 - enhance up2date_repo_autoconf by populating default configuration file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Apr 2007 14:57:53 -0000	1.10
+++ sources	13 Aug 2007 07:03:30 -0000	1.11
@@ -1 +1 @@
-344a11f6340b84493e6d4db148f575c2  firmware-addon-dell-1.2.13.tar.gz
+432f5c32a2c6bac8885810036a7ab720  firmware-addon-dell-1.4.2.tar.gz




More information about the fedora-extras-commits mailing list