Updated for 1.7.4rc3

[freeside.git] / install / rpm / freeside.spec

diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index 566b1aa..cbe19a6 100644 (file)
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -1,6 +1,6 @@
 %{!?_initrddir:%define _initrddir /etc/rc.d/init.d}
-%{!?version:%define version 1.7.3}
-%{!?release:%define release 6}
+%{!?version:%define version 1.7.4rc3}
+%{!?release:%define release 1}
 
 Summary: Freeside ISP Billing System
 Name: freeside
@@ -188,7 +188,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
@@ -379,12 +379,14 @@ fi
 %triggerin postgresql -- %{name}
 if [ ! -d %{freeside_conf}/conf.DBI:Pg:dbname=%{name} ]; then
        mkdir %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
+       chown freeside.freeside %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
        cp -pr %{freeside_conf}/default_conf/* %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
 fi
 
 %triggerin -- %{name}-postgresql
 if [ ! -d %{freeside_conf}/conf.DBI:Pg:dbname=%{name} ]; then
        mkdir %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
+       chown freeside.freeside %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
        cp -pr %{freeside_conf}/default_conf/* %{freeside_conf}/conf.DBI:Pg:dbname=%{name}
 fi
 
@@ -396,12 +398,14 @@ fi
 %triggerin mysql -- %{name}
 if [ ! -d %{freeside_conf}/conf.DBI:mysql:dbname=%{name} ]; then
        mkdir %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
+       chown freeside.freeside %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
        cp -pr %{freeside_conf}/default_conf/* %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
 fi
 
 %triggerin -- %{name}-mysql
 if [ ! -d %{freeside_conf}/conf.DBI:mysql:dbname=%{name} ]; then
        mkdir %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
+       chown freeside.freeside %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
        cp -pr %{freeside_conf}/default_conf/* %{freeside_conf}/conf.DBI:mysql:dbname=%{name}
 fi
 
@@ -436,6 +440,7 @@ fi
 %attr(-,freeside,freeside) %dir %{freeside_lock}
 %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/*
 
 %files mason -f %{name}-%{version}-%{release}-mason-filelist
 %defattr(-, freeside, freeside, 0755)