X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Ffreeside.spec;h=0f5ecc818eb7c66a267da3760390ea4bd60ed6ce;hp=e245fd37a2796fd7e9a5014bf4d466178e3c3a20;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hpb=f544c8f095cfb2e844810d31b6230b96033cb1e8 diff --git a/rpm/freeside.spec b/rpm/freeside.spec index e245fd37a..0f5ecc818 100644 --- a/rpm/freeside.spec +++ b/rpm/freeside.spec @@ -1,5 +1,5 @@ %{!?_initrddir:%define _initrddir /etc/rc.d/init.d} -%{!?version:%define version 1.9} +%{!?version:%define version 2.3.0} %{!?release:%define release 8} Summary: Freeside ISP Billing System @@ -166,6 +166,7 @@ cat << \EOF > %{name}-req tee %{_tmppath}/filelist | %{_rpmlibdir}/rpmdeps --requires | grep -v -E '^perl\(the\)$' \ | grep -v -E '^perl\((lib|strict|vars|RT)\)$' \ | grep -v -E '^perl\(RT::' \ +| grep -v -E '^perl\(FS::' \ | sort -u grep handler.pl %{_tmppath}/filelist | xargs %{_rpmlibdir}/perldeps.pl --requires \ | grep -v -E '^perl\((lib|strict|vars|RT)\)$' \ @@ -194,7 +195,7 @@ else fi %{__make} OPTIMIZE="$RPM_OPT_FLAGS" cd .. -%{__make} perl-modules VERSION='%{version}-%{release}' RT_ENABLED=%{rt_enabled} FREESIDE_CACHE=%{freeside_cache} FREESIDE_CONF=%{freeside_conf} FREESIDE_EXPORT=%{freeside_export} FREESIDE_LOCK=%{freeside_lock} FREESIDE_LOG=%{freeside_log} +%{__make} perl-modules RT_ENABLED=%{rt_enabled} FREESIDE_CACHE=%{freeside_cache} FREESIDE_CONF=%{freeside_conf} FREESIDE_EXPORT=%{freeside_export} FREESIDE_LOCK=%{freeside_lock} FREESIDE_LOG=%{freeside_log} touch perl-modules cd fs_selfservice/FS-SelfService