rpms/firmware-addon-dell/EL-5 .cvsignore, 1.7, 1.8 firmware-addon-dell.spec, 1.6, 1.7 sources, 1.7, 1.8

[Michael E Brown (mebrown)]

Author: mebrown

Update of /cvs/extras/rpms/firmware-addon-dell/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17900

Modified Files:
	.cvsignore firmware-addon-dell.spec sources 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Apr 2007 04:13:22 -0000	1.7
+++ .cvsignore	8 Apr 2007 06:33:42 -0000	1.8
@@ -1 +1 @@
-firmware-addon-dell-1.2.10.tar.gz
+firmware-addon-dell-1.2.11.tar.gz


Index: firmware-addon-dell.spec
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/EL-5/firmware-addon-dell.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firmware-addon-dell.spec	8 Apr 2007 04:13:22 -0000	1.6
+++ firmware-addon-dell.spec	8 Apr 2007 06:33:42 -0000	1.7
@@ -6,7 +6,7 @@
 # START = Do not edit manually
 %define major 1
 %define minor 2
-%define sub 10
+%define sub 11
 %define extralevel %{nil}
 %define release_name firmware-addon-dell
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -79,10 +79,19 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %{suse_prefix}
 
-# if not RHEL3 or RHEL4, remove extra files so we dont get spurious errors from RPM
-%if %(test "%{dist}" == ".el3" -o "%{dist}" == ".el4" && echo 0 || echo 1)
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rhn/dell-hardware.conf
-rm -f $RPM_BUILD_ROOT/%{_bindir}/up2date_repo_autoconf
+
+%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
 
  
@@ -107,6 +116,9 @@
 
 
 %changelog
+* 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
+
 * Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.10-1
 - Couple of changes so that the dell sysid plugin work on yum 2.4.3
   prior versions didnt crash, but didnt properly substitute mirrolist 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firmware-addon-dell/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Apr 2007 04:13:22 -0000	1.7
+++ sources	8 Apr 2007 06:33:42 -0000	1.8
@@ -1 +1 @@
-f9266a5427cb3e1e171ef9c6a6bc292b  firmware-addon-dell-1.2.10.tar.gz
+53c8db63777349429f3db756ddda843e  firmware-addon-dell-1.2.11.tar.gz