stray closing /TABLE in the no-ticket case

[freeside.git] / rpm / freeside.spec

diff --git a/rpm/freeside.spec b/rpm/freeside.spec
index e245fd3..bac6ff8 100644 (file)
--- 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.1.1}
 %{!?release:%define release 8}
 
 Summary: Freeside ISP Billing System
@@ -8,9 +8,9 @@ Version: %{version}
 Release: %{release}
 License: AGPLv3
 Group: Applications/Internet
-URL: http://www.sisd.com/freeside/
+URL: http://www.freeside.biz/freeside/
 Vendor: Freeside
-Source: http://www.sisd.com/freeside/%{name}-%{version}.tar.gz
+Source: http://www.freeside.biz/freeside/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: %{name}-frontend
@@ -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