Accepting request 96301 from home:elvigia:branches:hardware

- Update to version fwts-0.24.13 OBS-URL: https://build.opensuse.org/request/show/96301 OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=2
2011-12-12 05:16:35 +00:00 · 2011-12-12 05:16:35 +00:00 · dba5348276
commit dba5348276
parent d1abacdb87
7 changed files with 136 additions and 91 deletions
--- a/fwts-0.18.1.tar.bz2
+++ b/fwts-0.18.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43996be207f91856e4da29f14935e1d8a5aaf7b5e98f37c1e5a14761545a38ef
-size 153189
--- a/fwts-0.24.13_git201111102129.tar.bz2
+++ b/fwts-0.24.13_git201111102129.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e863f2ce93e690cf33d79137c14cfab35542c43f559cb2ab34d2c1c5e3d5d087
+size 1081911
--- a/fwts-opensuse.patch
+++ b/fwts-opensuse.patch
@ -0,0 +1,88 @@
+--- src/lib/include/fwts_binpaths.h.orig
+++ src/lib/include/fwts_binpaths.h
+@@ -20,7 +20,7 @@
+ #ifndef __FWTS_BINPATHS_H__
+ #define __FWTS_BINPATHS_H__
+ 
+-#define	FWTS_LSPCI_PATH		"/usr/bin/lspci"
+#define	FWTS_LSPCI_PATH		"/sbin/lspci"
+ #define	FWTS_DMIDECODE_PATH	"/usr/sbin/dmidecode"
+ #define FWTS_IASL_PATH		"/usr/bin/iasl"
+ 
+--- src/lib/include/fwts_microcode.h.orig
+++ src/lib/include/fwts_microcode.h
+@@ -21,7 +21,7 @@
+ #define __FWTS_MICROCODE_H__
+ 
+ #define FWTS_MICROCODE_DEVICE	"/dev/cpu/microcode"
+-#define FWTS_MICROCODE_FILE	"/usr/share/misc/intel-microcode.dat"
+#define FWTS_MICROCODE_FILE	"/lib/firmware/microcode.dat"
+ 
+ int fwts_update_microcode(fwts_framework *fw, const char *device, const char *filename);
+ 
+--- configure.ac.orig
+++ configure.ac
+@@ -1,5 +1,5 @@
+ 	  AC_INIT([fwts],[0.1],[colin.king@canonical.com])
+-          AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+          AM_INIT_AUTOMAKE([-Wall foreign])
+ 	  AC_CANONICAL_HOST
+ 	  AC_CONFIG_MACRO_DIR([m4])
+           AC_PROG_CC
+--- src/Makefile.am.orig
+++ src/Makefile.am
+@@ -6,7 +6,7 @@
+ # but libfwts.so depends on libraries produced by acpica/source/compiler.
+ SUBDIRS = acpica/source/compiler lib acpica
+  
+-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -Wall -Werror
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -Wall
+ 
+ bin_PROGRAMS = fwts
+ fwts_SOURCES = main.c \
+--- src/lib/src/Makefile.am.orig
+++ src/lib/src/Makefile.am
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/lib/include \
+ 	-I$(top_srcdir)/src/acpica/source/include \
+ 	-I$(top_srcdir)/src/acpica/source/compiler \
+-	-Wall -Werror
+	-Wall
+ 
+ lib_LTLIBRARIES = libfwts.la
+ libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
+--- src/acpica/source/compiler/aslutils.c.orig
+++ src/acpica/source/compiler/aslutils.c
+@@ -528,8 +528,8 @@ UtDisplaySummary (
+     {
+         /* Compiler name and version number */
+ 
+-        FlPrintFile (FileId, "%s version %X%s [%s]\n",
+-            ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH, __DATE__);
+        FlPrintFile (FileId, "%s version %X%s\n",
+            ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH);
+     }
+ 
+     if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA)
+--- src/acpica/source/include/acapps.h.orig
+++ src/acpica/source/include/acapps.h
+@@ -141,15 +141,15 @@
+ /* Macros for signons and file headers */
+ 
+ #define ACPI_COMMON_SIGNON(UtilityName) \
+-    "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \
+    "\n%s\n%s version %8.8X%s\n%s\n\n", \
+     ACPICA_NAME, \
+-    UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+    UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \
+     ACPICA_COPYRIGHT
+ 
+ #define ACPI_COMMON_HEADER(UtilityName, Prefix) \
+-    "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
+    "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \
+     Prefix, ACPICA_NAME, \
+-    Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+    Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \
+     Prefix, ACPICA_COPYRIGHT, \
+     Prefix
+ 
--- a/fwts.changes
+++ b/fwts.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 12 05:02:37 UTC 2011 - crrodriguez@opensuse.org
+
+- Update to version fwts-0.24.13 
+
 -------------------------------------------------------------------
 Wed Sep  1 10:02:05 CEST 2010 - stepan@coresystems.de

--- a/fwts.spec
+++ b/fwts.spec
@ -8,22 +8,28 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild

 Name:           fwts
-Url:            http://kernel.ubuntu.com/git?p=cking/fwts/.git
-License:        GPL v2 or later
-Group:          Development/Tools/Other
-Requires:       acpica dmidecode pciutils
-AutoReqProv:    on
-Summary:        Firmware Test Suite
-Version:        0.18.1
+Version:        0.24.13_git201111102129
 Release:        1
+License:        GPLv2+
+Summary:        Firmware Test Suite
+Url:            http://kernel.ubuntu.com/git?p=cking/fwts/.git
+Group:          Development/Tools/Other
 Source:         %{name}-%{version}.tar.bz2
-Patch0:		no-werror.diff
-Patch1:		libm-hack.diff
+Patch:         fwts-opensuse.patch
+BuildRequires:  pciutils-devel
+BuildRequires:  pcre-devel
+BuildRequires:  libjson-devel
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  libtool
+BuildRequires:  automake
+Requires:       acpica
+Requires:       dmidecode
+Requires:       pciutils
+Requires:       firmware(microcode.dat)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  pciutils-devel pcre pcre-devel

 %description
 The FirmWare Test Suite (fwts) is a tool to do automatic testing of a PC's
@ -34,24 +40,36 @@ will give some form of advice on how to fix issues or workaround firmware
 issues.

 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+%patch

 %build
-%configure
-make
+autoreconf -fiv
+export CFLAGS="%optflags -fno-strict-aliasing"
+%configure --disable-static
+make %{?_smp_mflags}

 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-
+%make_install
+find %{buildroot} -type f -name "*.la" -print -delete 
+install -D -m 0644 data/klog.json %{buildroot}%{_datadir}/%{name}/klog.json
+install -D -m 0644 data/syntaxcheck.json %{buildroot}%{_datadir}/%{name}/syntaxcheck.json
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig 
+
+%postun -p /sbin/ldconfig

 %files
-%defattr(644,root,root)
-%doc /usr/share/man/man1/fwts.1.gz
 %defattr(-,root,root)
-/usr/bin/fwts
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/klog.json
+%{_datadir}/%{name}/syntaxcheck.json
+%{_mandir}/man1/fwts*.1.gz
+%{_bindir}/fwts
+%{_libdir}/libfwts*.so*
+
+

 %changelog
--- a/libm-hack.diff
+++ b/libm-hack.diff
@ -1,12 +0,0 @@
-diff -ur fwts-0.18.1.orig/src/Makefile.am fwts-0.18.1/src/Makefile.am
--- fwts-0.18.1.orig/src/Makefile.am	2010-09-01 10:17:46.000000000 +0200
-+++ fwts-0.18.1/src/Makefile.am	2010-09-01 10:35:25.000000000 +0200
-@@ -40,7 +40,7 @@
- 	hotkey/hotkey/hotkey.c \
- 	kernel/version/version.c
- 
-fwts_LDADD = $(top_srcdir)/src/lib/src/libtestsuite.a
-+fwts_LDADD = $(top_srcdir)/src/lib/src/libtestsuite.a -lm
- 
- man_MANS = ../doc/fwts.1
- 
--- a/no-werror.diff
+++ b/no-werror.diff
@ -1,54 +0,0 @@
-diff -ur fwts-0.18.1.orig/configure.ac fwts-0.18.1/configure.ac
--- fwts-0.18.1.orig/configure.ac	2010-09-01 09:54:13.000000000 +0200
-+++ fwts-0.18.1/configure.ac	2010-09-01 10:18:13.000000000 +0200
-@@ -1,5 +1,5 @@
- AC_INIT([fwts],[0.1],[colin.king@canonical.com])
-          AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+          AM_INIT_AUTOMAKE([-Wall foreign])
-           AC_PROG_CC
- 	  AC_PROG_RANLIB
- 	  AC_C_INLINE
-diff -ur fwts-0.18.1.orig/src/lib/src/Makefile.am fwts-0.18.1/src/lib/src/Makefile.am
--- fwts-0.18.1.orig/src/lib/src/Makefile.am	2010-09-01 09:54:13.000000000 +0200
-+++ fwts-0.18.1/src/lib/src/Makefile.am	2010-09-01 10:19:19.000000000 +0200
-@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include  -Wall -Werror
-+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include  -Wall
- 
- noinst_LIBRARIES = libtestsuite.a
- libtestsuite_a_SOURCES = \
-diff -ur fwts-0.18.1.orig/src/lib/src/Makefile.in fwts-0.18.1/src/lib/src/Makefile.in
--- fwts-0.18.1.orig/src/lib/src/Makefile.in	2010-09-01 09:54:13.000000000 +0200
-+++ fwts-0.18.1/src/lib/src/Makefile.in	2010-09-01 10:19:14.000000000 +0200
-@@ -157,7 +157,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include  -Wall -Werror
-+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include  -Wall
- noinst_LIBRARIES = libtestsuite.a
- libtestsuite_a_SOURCES = \
- 	list.c \
-diff -ur fwts-0.18.1.orig/src/Makefile.am fwts-0.18.1/src/Makefile.am
--- fwts-0.18.1.orig/src/Makefile.am	2010-09-01 09:54:13.000000000 +0200
-+++ fwts-0.18.1/src/Makefile.am	2010-09-01 10:17:46.000000000 +0200
-@@ -1,6 +1,6 @@
- SUBDIRS = lib
-  
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -Wall -Werror
-+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -Wall
- AM_LDFLAGS = -lm -lpcre
- 
- bin_PROGRAMS = fwts
-diff -ur fwts-0.18.1.orig/src/Makefile.in fwts-0.18.1/src/Makefile.in
--- fwts-0.18.1.orig/src/Makefile.in	2010-09-01 09:54:13.000000000 +0200
-+++ fwts-0.18.1/src/Makefile.in	2010-09-01 10:17:53.000000000 +0200
-@@ -222,7 +222,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = lib
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -Wall -Werror
-+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -Wall
- AM_LDFLAGS = -lm -lpcre
- fwts_SOURCES = main.c \
- 	acpi/klog/klog.c \