[microcode_ctl] update to upstream version 1.18

[Anton Arapov]

commit 1f1833d8cb4e29aa99f03c1a1ef5960fdfeb171a
Author: Anton Arapov <anton at redhat.com>
Date:   Wed Jul 25 20:54:18 2012 +0200

    update to upstream version 1.18
    
    ssia
    
    Signed-off-by: Anton Arapov <anton at redhat.com>

 .gitignore                      |    2 +
 microcode_ctl-1.17-getopt.patch |   23 ---------
 microcode_ctl-manpage-0.patch   |   12 -----
 microcode_ctl.patch             |   95 ---------------------------------------
 microcode_ctl.rules             |    1 -
 microcode_ctl.spec              |   53 ++++++---------------
 sources                         |    5 +-
 7 files changed, 19 insertions(+), 172 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a29cb5..ff337d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ microcode-20100826.dat
 /microcode-20111110.dat
 /amd-ucode-2012-01-17.tar
 /microcode-20120606.dat
+/microcode_ctl-1.18.tar.xz
+/microcode_ctl.rules
diff --git a/microcode_ctl.spec b/microcode_ctl.spec
index 90f2545..a0f3eb9 100644
--- a/microcode_ctl.spec
+++ b/microcode_ctl.spec
@@ -1,73 +1,47 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
-Version:        1.17
-Release:        26%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+ and Redistributable, no modification permitted
-URL:            http://www.urbanmyth.org/microcode/
-Source0:        http://www.urbanmyth.org/microcode/microcode_ctl-%{version}.tar.gz
+URL:            http://fedorahosted.org/microcode_ctl
+Source0:        http://fedorahosted.org/released/microcode_ctl/%{name}-%{version}.tar.xz
 Source1:        microcode_ctl.rules
-# Microcode now distributed directly by Intel, at
-# http://downloadcenter.intel.com (just search for microcode)
-Source2:        microcode-20120606.dat
-# http://www.amd64.org/support/microcode.html
-Source3:        amd-ucode-2012-01-17.tar
-# Tool for splitting Intel's microcode file
-Source4:        intel-microcode2ucode.c
+Source2:        intel-microcode2ucode.c
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       udev
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
 ExclusiveArch:  %{ix86} x86_64
 
-Patch1: microcode_ctl.patch
-Patch2: microcode_ctl-manpage-0.patch
-Patch3: microcode_ctl-1.17-getopt.patch
-
 %description
 microcode_ctl - updates the microcode on Intel and AMD x86/x86-64 CPU's
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-tar xf %{SOURCE3}
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
-gcc -Wall -o intel-microcode2ucode %{SOURCE4}
+gcc -Wall -o intel-microcode2ucode %{SOURCE2}
 
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/usr/share/man/man{1,8}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-mkdir -p %{buildroot}/lib/firmware/amd-ucode/
-
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
-     INSDIR=/sbin MANDIR=%{_mandir}/man8 RCDIR=%{_sysconfdir} install clean
+     INSDIR=/usr/sbin MANDIR=%{_mandir}/man8 install clean
 
 rm -rf %{buildroot}/etc/*
 
 mkdir -p %{buildroot}/lib/udev/rules.d
 install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/89-microcode.rules
 
-install -m 644 amd-ucode-2012-01-17/microcode_amd.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd.bin
-install -m 644 amd-ucode-2012-01-17/microcode_amd_fam15h.bin %{buildroot}/lib/firmware/amd-ucode/microcode_amd_fam15h.bin
-install -m 644 amd-ucode-2012-01-17/LICENSE LICENSE.microcode_amd
-install -m 644 amd-ucode-2012-01-17/README README.microcode_amd
-install -m 644 amd-ucode-2012-01-17/INSTALL INSTALL.microcode_amd
-
-install -m 755 intel-microcode2ucode %{buildroot}/sbin
-%{buildroot}/sbin/intel-microcode2ucode %{SOURCE2} >/dev/null
+install -m 755 intel-microcode2ucode %{buildroot}/usr/sbin/
+%{buildroot}/usr/sbin/intel-microcode2ucode %{buildroot}/lib/firmware/microcode.dat >/dev/null
 chmod 0755 intel-ucode
 mv intel-ucode %{buildroot}/lib/firmware
 rm %{buildroot}/lib/firmware/microcode.dat
 
-chmod -R a-s %{buildroot}
-
 %clean
 rm -rf %{buildroot}
 
@@ -75,9 +49,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 /lib/firmware/*
 /lib/udev/rules.d/*
-/sbin/microcode_ctl
-/sbin/intel-microcode2ucode
-%doc LICENSE.microcode_amd README.microcode_amd INSTALL.microcode_amd
+/usr/sbin/microcode_ctl
+/usr/sbin/intel-microcode2ucode
+%doc /usr/share/doc/microcode_ctl/*
 %attr(0644,root,root) %{_mandir}/*/*
 
 %triggerun -- microcode_ctl < 1:1.17-2
@@ -86,6 +60,9 @@ exit 0
 
 
 %changelog
+* Wed Jul 25 2012 Anton Arapov <anton at redhat.com> 1.18-1
+- Update to upstream 1.18
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.17-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a691f49..fa07627 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-c0eabb7e25e1f9045b7dd5ceabfddd09  amd-ucode-2012-01-17.tar
+e56c4ded4787fbccf5e503165f1559b8  microcode_ctl-1.18.tar.xz
 0efc5f6c74a4d7e61ca22683c93c98cf  intel-microcode2ucode.c
-98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
-1a1cf79dd1fab186c8a8fbae69aa9649  microcode-20120606.dat
+33aa5714e6b7df82a62700109cdf6ef9  microcode_ctl.rules