- x86_64 patch (just LIBDIR change to another hardcoded value) replaced by generic...

diff --git a/hwinfo-x86_64.patch b/hwinfo-x86_64.patch
deleted file mode 100644 (file)
index 5a924a8..0000000
--- a/hwinfo-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- x/Makefile 2006-09-11 17:40:23.000000000 +0200
-+++ x/Makefile 2007-05-24 20:04:06.000000000 +0200
-@@ -2,7 +2,7 @@
- SUBDIRS               = src
- TARGETS               = hwinfo hwinfo.pc
- CLEANFILES    = hwinfo hwinfo.pc hwinfo.static hwscan hwscan.static hwscand hwscanqueue doc/libhd doc/*~
--LIBDIR                = /usr/lib
-+LIBDIR                = /usr/lib64
- ULIBDIR               = $(LIBDIR)
- LIBS          = -lhd
- SLIBS         = -lhd -ldbus-1 -lhal

diff --git a/hwinfo.spec b/hwinfo.spec
index dd54eb48c2445f2113b0b22edf7255d0b2246977..3c1b08c02e117f2333b841a974b22c878d2d7523 100644 (file)
--- a/hwinfo.spec
+++ b/hwinfo.spec
@@ -13,7 +13,6 @@ Source0:      http://ftp.debian.org/debian/pool/main/h/hwinfo/%{name}_%{version}.orig
 # Source0-md5: 3a97acf3e32e43dfea13b90da1a8403a
 Patch0:                %{name}-kbd.patch
 Patch1:                %{name}-headers.patch
-Patch2:                %{name}-x86_64.patch
 URL:           http://packages.qa.debian.org/h/hwinfo.html
 BuildRequires: dbus-devel >= 0.35
 BuildRequires: flex
@@ -47,9 +46,6 @@ Pliki nagłówkowe biblioteki hwinfo.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
 
 # these should be in tarball, but aren't (21.6)
 test -e VERSION || echo %{version} > VERSION
@@ -60,13 +56,15 @@ test -e changelog || touch changelog
        VERSION=%{version} \
        ARCH=%{_target_base_arch} \
        CC="%{__cc}" \
+       LIBDIR=%{_libdir} \
        RPM_OPT_FLAGS="%{rpmcflags} %{?with_hal:-DWITH_HAL}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT