X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Ffreeside.spec;h=9312270430c8cc07faf3b955a38bcc5c2a74e2f6;hp=e29511b201832cbd1ed2d7c09c4fc00bd1a930be;hb=ad7f49821d40ffd099a45acc32ba91e0e211aede;hpb=259799d1ba225ff894b67f5e7c3f70c6af26c5f1 diff --git a/rpm/freeside.spec b/rpm/freeside.spec index e29511b20..931227043 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 1.9.1} %{!?release:%define release 8} Summary: Freeside ISP Billing System @@ -17,8 +17,10 @@ Requires: %{name}-frontend Requires: %{name}-backend %if "%{_vendor}" != "suse" Requires: tetex-latex +Requires: ghostscript %else Requires: te_latex +Requires: ghostscript-library %endif Requires: perl-Fax-Hylafax-Client @@ -48,6 +50,8 @@ Requires: perl-Fax-Hylafax-Client %define fs_cron_user fs_daily %define db_types Pg mysql +%define texmflocal /usr/share/texmf + %define _rpmlibdir /usr/lib/rpm %define rpmfiles rpm @@ -162,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)\)$' \ @@ -190,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 @@ -328,6 +333,9 @@ cd ../.. %{__install} %{rpmfiles}/freeside-selfservice.conf $RPM_BUILD_ROOT%{apache_confdir}/%{name}-selfservice.conf %{__perl} -pi -e "s|%%%%%%FREESIDE_SELFSERVICE_DOCUMENT_ROOT%%%%%%|%{freeside_selfservice_document_root}|g" $RPM_BUILD_ROOT%{apache_confdir}/%{name}-selfservice.conf +# This is part of Makefile's install-texmf. The rest is in triggers. These files are not in the filelist +%{__install} -D etc/fslongtable.sty $RPM_BUILD_ROOT%{texmflocal}/tex/generic/fslongtable.sty + %pre if ! %{__id} freeside &>/dev/null; then %if "%{_vendor}" == "suse" @@ -405,6 +413,10 @@ if ! %{__grep} TEXINPUTS /etc/init.d/apache2 >/dev/null; then fi %endif +%triggerin -- tetex +#texhash `kpsewhich -expand-var \$TEXMFLOCAL` +texhash %{texmflocal} + %clean %{__rm} -rf %{buildroot} @@ -418,6 +430,7 @@ fi %attr(-,freeside,freeside) %dir %{freeside_log} %attr(0711,freeside,freeside) %config(noreplace) %{freeside_conf}/default_conf %attr(0644,freeside,freeside) %config(noreplace) %{freeside_conf}/default_conf/* +%attr(444,root,root) %{texmflocal}/tex/generic/fslongtable.sty %files mason -f %{name}-%{version}-%{release}-mason-filelist %defattr(-, freeside, freeside, 0755)