From 82d1fdd24a21b8157ec783c2da1aac4a2060bd90 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Nov 02 2005 22:41:27 +0000 Subject: - Fix 64bit LIBDIR issue; use $LIBDIR instead of $PREFIX/lib --- diff --git a/libnl-64bit.patch b/libnl-64bit.patch new file mode 100644 index 0000000..077ee93 --- /dev/null +++ b/libnl-64bit.patch @@ -0,0 +1,23 @@ +diff -ru libnl-1.0-pre5-64bit-issues/lib/Makefile libnl-1.0-pre5/lib/Makefile +--- libnl-1.0-pre5-64bit-issues/lib/Makefile 2005-11-02 12:29:06.000000000 -0500 ++++ libnl-1.0-pre5/lib/Makefile 2005-11-02 17:07:47.000000000 -0500 +@@ -13,7 +13,7 @@ + include ../Makefile.opts + endif + +-LIBDIR=$(prefix)/lib ++LIBDIR=$(libdir) + + # Core + CIN := $(wildcard *.c) +diff -ru libnl-1.0-pre5-64bit-issues/Makefile.opts.in libnl-1.0-pre5/Makefile.opts.in +--- libnl-1.0-pre5-64bit-issues/Makefile.opts.in 2005-11-02 12:29:06.000000000 -0500 ++++ libnl-1.0-pre5/Makefile.opts.in 2005-11-02 17:06:50.000000000 -0500 +@@ -19,6 +19,7 @@ + LIBNL_LIB := @LIBNL_LIB@ + + prefix := @prefix@ ++libdir := @libdir@ + mandir := @mandir@ + sysconfdir := @sysconfdir@ + diff --git a/libnl.spec b/libnl.spec index 64d9988..183e866 100644 --- a/libnl.spec +++ b/libnl.spec @@ -5,12 +5,13 @@ Group: Development/Libraries License: LGPL Name: libnl Version: 1.0 -Release: 0.4.%{preversion} +Release: 0.5.%{preversion} URL: http://people.suug.ch/~tgr/libnl/ Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz Source1: %{name}-1.pc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: doxygen +Patch1: libnl-64bit.patch %description This package contains a convenience library to simplify @@ -28,6 +29,7 @@ This package contains various headers for using libnl %prep %setup -q -n libnl-%{version}-%{preversion} +%patch1 -p1 %build %configure @@ -59,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}-1.pc %changelog +* Wed Nov 2 2005 Christopher Aillon 1.0-0.5.pre5 +- Fix 64bit LIBDIR issue; use $LIBDIR instead of $PREFIX/lib + * Wed Nov 2 2005 Christopher Aillon 1.0-0.4.pre5 - Update to 1.0-pre5