From: rsiddall <rsiddall>
Date: Thu, 8 Nov 2007 02:15:47 +0000 (+0000)
Subject: Fix for bug that prevented RPMs building on x86_64: wrong path to brp-compress.
X-Git-Tag: freeside_1_7_3rc1~274
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=1d95370f72334b7e4458b60124a4502df2a22802;p=freeside.git

Fix for bug that prevented RPMs building on x86_64: wrong path to brp-compress.
---

diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index 57d9e18ab..1e1b91c48 100644
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -31,6 +31,8 @@ Requires: tetex-latex
 %define	fs_selfservice_user	fs_selfservice
 %define	fs_cron_user		fs_daily
 
+%define _rpmlibdir	/usr/lib/rpm
+
 %description
 Freeside is a flexible ISP billing system written by Ivan Kohler
 
@@ -181,7 +183,7 @@ eval `perl '-V:installarchlib'`
 %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
 %{__rm} -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
 
-[ -x %{_libdir}/rpm/brp-compress ] && %{_libdir}/rpm/brp-compress
+[ -x %{_rpmlibdir}/brp-compress ] && %{_rpmlibdir}/brp-compress
 
 find $RPM_BUILD_ROOT%{_prefix} -type f -print | \
 	grep -v '/etc/freeside/conf' | \
@@ -199,7 +201,7 @@ cd fs_selfservice/FS-SelfService
 %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
 %{__rm} -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
 
-[ -x %{_libdir}/rpm/brp-compress ] && %{_libdir}/rpm/brp-compress
+[ -x %{_rpmlibdir}/brp-compress ] && %{_rpmlibdir}/brp-compress
 
 find $RPM_BUILD_ROOT%{_prefix} -type f -print | \
 	grep -v '/etc/freeside/conf' | \