rpms/microcode_ctl/F-7 .cvsignore, 1.6, 1.7 microcode_ctl.spec, 1.39, 1.40 sources, 1.6, 1.7

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/microcode_ctl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17371

Modified Files:
	.cvsignore microcode_ctl.spec sources 
Log Message:
* Thu Feb 07 2008 Jarod Wilson <jwilson at redhat.com>
- Spec cleanup and macro standardization.
- Update license
- Update microcode data file to 20080131 revision.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Jun 2007 15:12:44 -0000	1.6
+++ .cvsignore	8 Feb 2008 02:56:54 -0000	1.7
@@ -1 +1,4 @@
+clog
+microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
+microcode-20080131.dat


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-7/microcode_ctl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- microcode_ctl.spec	28 Jun 2007 15:26:04 -0000	1.39
+++ microcode_ctl.spec	8 Feb 2008 02:56:54 -0000	1.40
@@ -4,9 +4,13 @@
 Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
-License:        GPL
-Source0:        microcode_ctl-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://www.urbanmyth.org/microcode/
+Source0:        http://www.urbanmyth.org/microcode/microcode_ctl-%{version}.tar.gz
 Source1:	microcode_ctl.init
+# Microcode now distributed directly by Intel, at
+# http://downloadcenter.intel.com/default.aspx (just search for microcode)
+Source2:        microcode-20080131.dat
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Prereq:		/sbin/chkconfig /sbin/service
 Prereq:		grep gawk coreutils
@@ -19,41 +23,33 @@
 microcode_ctl - updates the microcode on Intel x86/x86-64 CPU's
 
 %prep
-%setup -q -c
-%patch1 -p0
+%setup -q
+%patch1 -p1
 
 %build
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p %{buildroot}/usr/sbin
-mkdir -p %{buildroot}/usr/man
-mkdir -p %{buildroot}/etc/rc.d/init.d
-mkdir -p %{buildroot}/etc/sysconfig
-
-cd microcode_ctl-%{version}
 make CFLAGS="$RPM_OPT_FLAGS"
-cd ..
 
 %install
-mkdir -p %{buildroot}/usr/share/man/man{1,8}
+rm -rf %{buildroot}
 
-cd microcode_ctl-%{version}
+mkdir -p %{buildroot}/usr/share/man/man{1,8}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
-     INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=/etc MICDIR=/etc/firmware install clean
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
+     INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} MICDIR=%{_sysconfdir}/firmware install clean
 
-install %{SOURCE1} %{buildroot}/etc/rc.d/init.d/microcode_ctl
-rm %{buildroot}/etc/init.d/microcode_ctl
-cd ..
+install %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/microcode_ctl
+install %{SOURCE2} %{buildroot}%{_sysconfdir}/firmware/microcode.dat
 
 chmod -R a-s %{buildroot}
+
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+[ "%{buildroot}" != "/" ] && [ -d %{buildroot} ] && rm -rf %{buildroot};
 
 %files
 %defattr(-,root,root)
-/etc/rc.d/init.d/microcode_ctl
-/etc/firmware/*
+%{_sysconfdir}/init.d/microcode_ctl
+%{_sysconfdir}/firmware/*
 /sbin/microcode_ctl
 %attr(0644,root,root) %{_mandir}/*/*
 
@@ -82,8 +78,13 @@
 exit 0
 
 %changelog
-* Thu Jun 28 2007 Jon Masters <jcm at redhat.com>
-- BZ236784 hardware fixes.
+* Thu Feb 07 2008 Jarod Wilson <jwilson at redhat.com>
+- Spec cleanup and macro standardization.
+- Update license
+- Update microcode data file to 20080131 revision.
+
+* Mon Jul  2 2007 Dave Jones <davej at redhat.com>
+- Update to upstream 1.17
 
 * Thu Oct 12 2006 Jon Masters <jcm at redhat.com>
 - BZ209455 fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Jun 2007 15:12:44 -0000	1.6
+++ sources	8 Feb 2008 02:56:54 -0000	1.7
@@ -1 +1,2 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
+87feaa28fee76eebdd6cf57a80c41e5f  microcode-20080131.dat