commit fabf08ec5175ba46d84fdc173e6f20d91a83e2a7 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Apr 12 22:26:50 2014 +0200
- updated to 21.3 - removed outdated update-vm86 patch hwinfo-update-vm86.patch | 17 ----------------- hwinfo.spec | 25 ++++++++++++++++--------- 2 files changed, 16 insertions(+), 26 deletions(-) --- diff --git a/hwinfo.spec b/hwinfo.spec index a3e068f..83b7c94 100644 --- a/hwinfo.spec +++ b/hwinfo.spec @@ -1,20 +1,22 @@ Summary: hwinfo - the hardware detection tool used in SuSE Linux Summary(pl.UTF-8): hwinfo - narzędzie do wykrywania sprzętu używane w SuSE Linuksie Name: hwinfo -Version: 16.0 -Release: 2 -License: GPL +Version: 21.3 +Release: 1 +License: GPL v2 Group: Applications/System Source0: http://ftp.debian.org/debian/pool/main/h/hwinfo/%{name}_%{version}.orig.tar.gz -# Source0-md5: b7e5cae47a373b75abd5a4a5f7584b98 +# Source0-md5: 594f879cf646131057f7e8e296ec6cf9 Patch0: %{name}-kbd.patch Patch1: %{name}-headers.patch Patch2: %{name}-x86_64.patch -Patch3: %{name}-update-vm86.patch URL: http://packages.qa.debian.org/h/hwinfo.html BuildRequires: dbus-devel >= 0.35 BuildRequires: flex BuildRequires: hal-devel +%ifarch %{ix86} %{x8664} +BuildRequires: libx86emu-devel >= 1 +%endif BuildRequires: linux-libc-headers >= 7:2.6.20 BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -38,16 +40,16 @@ Header files for hwinfo library. Pliki nagłówkowe biblioteki hwinfo. %prep -%setup -q +%setup -q -c %patch0 -p0 %patch1 -p1 %if "%{_lib}" == "lib64" %patch2 -p1 %endif -%patch3 -p1 %build %{__make} -j1 \ + ARCH=%{_target_base_arch} \ CC="%{__cc}" \ RPM_OPT_FLAGS="%{rpmcflags}" @@ -65,9 +67,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/* +%doc MAINTAINER README changelog +%attr(755,root,root) %{_sbindir}/check_hd +%attr(755,root,root) %{_sbindir}/convert_hd +%attr(755,root,root) %{_sbindir}/getsysinfo +%attr(755,root,root) %{_sbindir}/hwinfo +%attr(755,root,root) %{_sbindir}/mk_isdnhwdb %attr(755,root,root) %{_libdir}/libhd.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libhd.so.?? +%attr(755,root,root) %ghost %{_libdir}/libhd.so.21 %{_datadir}/%{name} %files devel diff --git a/hwinfo-update-vm86.patch b/hwinfo-update-vm86.patch deleted file mode 100644 index bc78f2f..0000000 --- a/hwinfo-update-vm86.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- hwinfo-13.41/src/int10/i10_v86.c~ 2008-09-18 16:17:44.728228369 +0200 -+++ hwinfo-13.41/src/int10/i10_v86.c 2008-09-18 16:16:18.131570414 +0200 -@@ -27,6 +27,14 @@ - #include <string.h> - #ifdef __i386__ - #include <sys/vm86.h> -+/* 2.6.26+ kernels don't define the legacy masks. */ -+#if defined(__linux__) && !defined(TF_MASK) -+ #define TF_MASK X86_EFLAGS_TF -+ #define IF_MASK X86_EFLAGS_IF -+ #define NT_MASK X86_EFLAGS_NT -+ #define VIF_MASK X86_EFLAGS_VIF -+ #define VIP_MASK X86_EFLAGS_VIP -+#endif - #else - #include "vm86_struct.h" - #endif ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hwinfo.git/commitdiff/fabf08ec5175ba46d84fdc173e6f20d91a83e2a7 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit