From 85b4bf9143b0227ebdde0d62e434bec7967e32c0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 9 May 2005 03:55:34 +0000 Subject: [PATCH] Fix stupid hardcoded libdir setting for 64bit arches --- librx-1.5-libdir64.patch | 11 +++++++++++ librx.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 librx-1.5-libdir64.patch diff --git a/librx-1.5-libdir64.patch b/librx-1.5-libdir64.patch new file mode 100644 index 0000000..28e36d0 --- /dev/null +++ b/librx-1.5-libdir64.patch @@ -0,0 +1,11 @@ +--- rx-1.5/rx/Makefile.in.BAD 2005-05-08 22:46:56.000000000 -0500 ++++ rx-1.5/rx/Makefile.in 2005-05-08 22:47:16.000000000 -0500 +@@ -25,7 +25,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = $(exec_prefix)/bin +-libdir = $(exec_prefix)/lib ++libdir = $(exec_prefix)/lib64 + includedir = $(prefix)/include + infodir = $(prefix)/info + diff --git a/librx.spec b/librx.spec index 5608cf4..5eb9276 100644 --- a/librx.spec +++ b/librx.spec @@ -4,13 +4,14 @@ Summary: POSIX regexp functions Name: librx Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.gnu.org/software/rx/rx.html Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2 Patch0: rx-1.5-shared.patch Patch1: rx-1.5-texinfo.patch +Patch2: librx-1.5-libdir64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: texinfo @@ -37,6 +38,9 @@ This package contains files needed for development with librx. %setup -q -n rx-%{version} %patch0 -p1 %patch1 -p1 -b .texipatch +%ifarch x86_64 ppc64 sparc64 +%patch2 -p1 -b .64bit +%endif %build %configure @@ -82,6 +86,9 @@ fi %{_libdir}/*.a %changelog +* Sun May 8 2005 Tom "spot" Callaway 1.5-4 +- Fix 64 bit arches to install to the right libdir + * Thu May 5 2005 Tom "spot" Callaway 1.5-3 - add BuildRequires: texinfo