[freeside-commits] freeside/install/rpm freeside.spec, 1.1.4.10, 1.1.4.11

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/install/rpm
In directory wavetail:/tmp/cvs-serv18963

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
Fix for bug that prevented RPMs building on x86_64: wrong path to brp-compress.


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.10
retrieving revision 1.1.4.11
diff -u -d -r1.1.4.10 -r1.1.4.11
--- freeside.spec	6 Nov 2007 21:43:01 -0000	1.1.4.10
+++ freeside.spec	8 Nov 2007 02:15:47 -0000	1.1.4.11
@@ -31,6 +31,8 @@
 %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 @@
 %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 @@
 %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' | \