rpms/librx/devel librx-1.5-libdir64.patch, NONE, 1.1 librx.spec, 1.3, 1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/librx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167/devel

Modified Files:
	librx.spec 
Added Files:
	librx-1.5-libdir64.patch 
Log Message:

Fix stupid hardcoded libdir setting for 64bit arches


librx-1.5-libdir64.patch:

--- NEW FILE librx-1.5-libdir64.patch ---
--- 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
 


Index: librx.spec
===================================================================
RCS file: /cvs/extras/rpms/librx/devel/librx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- librx.spec	5 May 2005 14:49:03 -0000	1.3
+++ librx.spec	9 May 2005 03:55:34 -0000	1.4
@@ -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 @@
 %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 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun May  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
+- Fix 64 bit arches to install to the right libdir
+
 * Thu May  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-3
 - add BuildRequires: texinfo